Test Feat/cluster

.github/workflows/github-actions.yml

@@ -8,7 +8,6 @@ on:
   pull_request:
     branches: ["*"]
 
-  workflow_dispatch:
 
 jobs:
   check:

application.yaml

@@ -21,4 +21,37 @@ dubbo:
     references:
       GreeterClientImpl:
         url: tri://localhost:20000
-        protocol: tri
+        protocol: tri
+  routers:
+    consumer:
+      - service: "org.apache.dubbo.sample.tri.Greeter"
+        url: triple://localhost:20000
+        protocol: triple
+    nacos:
+      addr: "127.0.0.1:8848"
+      namespace: ""
+      app: ""
+    conditions:
+      - scope: "service"
+        force: false
+        runtime: true
+        enabled: true
+        key: "org.apache.dubbo.sample.tri.Greeter"
+        conditions:
+          - method=greet => port=8889
+      - scope: "service"
+        force: true
+        runtime: true
+        enabled: true
+        key: "user.UserService"
+        conditions:
+          - method=get_s => port=2003
+    tags:
+      force: true
+      enabled: true
+      key: shop-detail
+      tags:
+        - name: gray
+          matches:
+            - key: env
+              value: gray

config/src/config.rs

@@ -17,7 +17,7 @@
 
 use std::{collections::HashMap, env, path::PathBuf};
 
-use crate::{protocol::Protocol, registry::RegistryConfig};
+use crate::{protocol::Protocol, registry::RegistryConfig, router::RouterConfig};
 use dubbo_logger::tracing;
 use dubbo_utils::yaml_util::yaml_file_parser;
 use once_cell::sync::OnceCell;
@@ -44,6 +44,9 @@ pub struct RootConfig {
     #[serde(default)]
     pub registries: HashMap<String, RegistryConfig>,
 
+    #[serde(default)]
+    pub routers: RouterConfig,
+
     #[serde(default)]
     pub data: HashMap<String, String>,
 }
@@ -63,6 +66,7 @@ impl RootConfig {
             protocols: HashMap::new(),
             registries: HashMap::new(),
             provider: ProviderConfig::new(),
+            routers: RouterConfig::default(),
             data: HashMap::new(),
         }
     }

config/src/lib.rs

@@ -21,4 +21,5 @@ pub mod config;
 pub mod protocol;
 pub mod provider;
 pub mod registry;
+pub mod router;
 pub mod service;

config/src/router.rs

@@ -0,0 +1,67 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
+pub struct ConditionRouterConfig {
+    pub scope: String,
+    pub force: bool,
+    pub runtime: bool,
+    pub enabled: bool,
+    pub key: String,
+    pub conditions: Vec<String>,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
+pub struct TagRouterConfig {
+    pub force: bool,
+    pub enabled: bool,
+    pub key: String,
+    pub tags: Vec<Tag>,
+}
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Default, Debug)]
+pub struct ConsumerConfig {
+    pub service: String,
+    pub url: String,
+    pub protocol: String,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
+pub struct Tag {
+    pub name: String,
+    pub matches: Vec<TagMatchRule>,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
+pub struct TagMatchRule {
+    pub key: String,
+    pub value: String,
+}
+
+impl ConditionRouterConfig {
+    pub fn new(config: &String) -> Self {
+        serde_yaml::from_str(config).expect("parse error")
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
+pub struct EnableAuth {
+    pub auth_username: String,
+    pub auth_password: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)]
+pub struct NacosConfig {
+    pub addr: String,
+    pub namespace: String,
+    pub app: String,
+    pub enable_auth: Option<EnableAuth>,
+    pub enable_auth_plugin_http: Option<bool>,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
+pub struct RouterConfig {
+    pub consumer: Option<Vec<ConsumerConfig>>,
+    pub nacos: Option<NacosConfig>,
+    pub conditions: Option<Vec<ConditionRouterConfig>>,
+    pub tags: Option<TagRouterConfig>,
+}

dubbo/Cargo.toml

@@ -14,7 +14,7 @@ hyper = { version = "0.14.26", features = ["full"] }
 http = "0.2"
 tower-service.workspace = true
 http-body = "0.4.4"
-tower = { workspace = true, features = ["timeout"] }
+tower = { workspace = true, features = ["timeout", "ready-cache"] }
 futures-util = "0.3.23"
 futures-core ="0.3.23"
 argh = "0.1"
@@ -40,8 +40,14 @@ urlencoding.workspace = true
 lazy_static.workspace = true
 dubbo-base.workspace = true
 dubbo-logger.workspace = true
+once_cell.workspace = true
 
 dubbo-config = { path = "../config", version = "0.3.0" }
 
 #对象存储
 state = { version = "0.5", features = ["tls"] }
+
+thiserror = "1.0.48"
+regex = "1.9.1"
+nacos-sdk = { version = "0.3.0", features = ["default"] }
+serde_yaml = "0.9.22"

dubbo/src/cluster/directory.rs

@@ -24,7 +24,6 @@ use std::{
 
 use crate::{
     codegen::TripleInvoker,
-    invocation::{Invocation, RpcInvocation},
     protocol::BoxInvoker,
     registry::{memory_registry::MemoryNotifyListener, BoxRegistry},
 };
@@ -51,7 +50,7 @@ impl StaticDirectory {
                 panic!("http uri parse error: {}, host: {}", err, host)
             }
         };
-        StaticDirectory { uri: uri }
+        StaticDirectory { uri }
     }
 
     pub fn from_uri(uri: &http::Uri) -> StaticDirectory {
@@ -60,12 +59,12 @@ impl StaticDirectory {
 }
 
 impl Directory for StaticDirectory {
-    fn list(&self, invocation: Arc<RpcInvocation>) -> Vec<BoxInvoker> {
+    fn list(&self, service_name: String) -> Vec<BoxInvoker> {
         let url = Url::from_url(&format!(
             "tri://{}:{}/{}",
             self.uri.host().unwrap(),
             self.uri.port().unwrap(),
-            invocation.get_target_service_unique_name(),
+            service_name,
         ))
         .unwrap();
         let invoker = Box::new(TripleInvoker::new(url));
@@ -89,8 +88,7 @@ impl RegistryDirectory {
 }
 
 impl Directory for RegistryDirectory {
-    fn list(&self, invocation: Arc<RpcInvocation>) -> Vec<BoxInvoker> {
-        let service_name = invocation.get_target_service_unique_name();
+    fn list(&self, service_name: String) -> Vec<BoxInvoker> {
 
         let url = Url::from_url(&format!(
             "triple://{}:{}/{}",