Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API - Add | Remove Routing Rules #3189

Merged
merged 7 commits into from Mar 29, 2024
Merged

API - Add | Remove Routing Rules #3189

merged 7 commits into from Mar 29, 2024

Conversation

hossinasaadi
Copy link
Contributor

add rules : ./xray api adrules --server=127.0.0.1:62789 c1.json c2.json
remove rules : ./xray api rmrules --server=127.0.0.1:62789 ruleTag1 ruleTag2

also add ruleTag to identify rules.

{
...
    "routing": {
...
      "rules": [
        {
          "ruleTag" : "mainRule",
          "outboundTag": "api",
          "type": "field",
          "inboundTag": [
            "api"
          ]
        },
...

@Fangliding
Copy link
Member

It seems the test has failed

@vrnobody
Copy link
Contributor

How about replace the entire routing object? That is easier to implement and use. More over we can hot-switch some balancing strategies too.

@hossinasaadi
Copy link
Contributor Author

It seems the test has failed

now should be ok

yuhan6665
yuhan6665 reviewed Mar 29, 2024
View reviewed changes
Copy link
Member

@yuhan6665 yuhan6665 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR! This is an important new feature. I've made some comments. Looking forward to it

app/router/router.go Outdated Show resolved Hide resolved
app/router/router.go Show resolved Hide resolved
main/commands/all/api/rules_add.go Show resolved Hide resolved
@hossinasaadi
add append flag
c49f101 
apply balancer config
@hossinasaadi
Copy link
Contributor Author

How about replace the entire routing object? That is easier to implement and use. More over we can hot-switch some balancing strategies too.

hot-switch balancer and replace|append new routing configs added.
@yuhan6665

@yuhan6665 yuhan6665 merged commit 53e5814 into XTLS:main Mar 29, 2024
34 checks passed
@yuhan6665
Copy link
Member

Thanks a lot! When I have time, I will integrate #412 as the next step. (Primarily to support GetRoutingRules API)

@hossinasaadi
Copy link
Contributor Author

hossinasaadi commented Mar 29, 2024 •
edited

Thanks a lot! When I have time, I will integrate #412 as the next step. (Primarily to support GetRoutingRules API)

glad to hear that.also i will check and see how can i help with that.

@hossinasaadi hossinasaadi deleted the api branch March 29, 2024 17:42
@RPRX RPRX mentioned this pull request Mar 31, 2024
Merged
bygreencn added a commit to bygreencn/ray-core that referenced this pull request Apr 1, 2024
@bygreencn
Merge tag 'v1.8.10'
219075b 
* tag 'v1.8.10': (22 commits)
  v1.8.10
  Fix TestXrayConfig in xray_test.go
  Add separate host config for websocket
  Update proto file for websocket and httpupgrade (breaking)
  API - Add | Remove Routing Rules  (XTLS#3189)
  Fix host in headers field does not work XTLS#3191
  fix: config `burstObservatory` override
  Bump github.com/sagernet/sing from 0.3.6 to 0.3.8
  Add support for HTTPupgrade custom headers
  improve balancer_info.go
  Fix(httpupgrade): `X-Forwarded-For` header not read. (XTLS#3172)
  Allow to send through random IPv6
  Update HTTPUpgrade spelling and proto
  Chore: Clean up legacy `field` usage
  Update README.md
  Bump github.com/quic-go/quic-go from 0.41.0 to 0.42.0
  Fix HTTPUpgrade transport register
  HTTPUpgrade 0-RTT (XTLS#3152)
  Apply FallbackTag to leastping and roundrobin
  Add ConnRF to make HTTPUpgrade 0-RTT
  ...
arror added a commit to arror/Xray-core that referenced this pull request Apr 2, 2024
@arror
Merge branch 'main' into socket_options
52940ae 
* main: (24 commits)
  Add "nosni" option to send empty SNI (XTLS#3214)
  API: add Source IP Block command (XTLS#3211)
  v1.8.10
  Fix TestXrayConfig in xray_test.go
  Add separate host config for websocket
  Update proto file for websocket and httpupgrade (breaking)
  API - Add | Remove Routing Rules  (XTLS#3189)
  Fix host in headers field does not work XTLS#3191
  fix: config `burstObservatory` override
  Bump github.com/sagernet/sing from 0.3.6 to 0.3.8
  Add support for HTTPupgrade custom headers
  improve balancer_info.go
  Fix(httpupgrade): `X-Forwarded-For` header not read. (XTLS#3172)
  Allow to send through random IPv6
  Update HTTPUpgrade spelling and proto
  Chore: Clean up legacy `field` usage
  Update README.md
  Bump github.com/quic-go/quic-go from 0.41.0 to 0.42.0
  Fix HTTPUpgrade transport register
  HTTPUpgrade 0-RTT (XTLS#3152)
  ...
4nd3r5on pushed a commit to 4nd3r5on/Xray-core that referenced this pull request Apr 2, 2024
@hossinasaadi @4nd3r5on
API - Add | Remove Routing Rules (XTLS#3189)
ec3e880 
* add RuleTag to routing rules

* add router pb commands

* add and remove routing rules api

* cleanup

* fix

* improve error msg

* add append flag
apply balancer config
@mzbqhbc
Copy link

mzbqhbc commented Apr 10, 2024

I run the command line and get this error
failed to perform AddRule: rpc error: code = Unimplemented desc = unknown service xray.app.router.command.RoutingService

@hossinasaadi
Copy link
Contributor Author

RoutingService

I run the command line and get this error failed to perform AddRule: rpc error: code = Unimplemented desc = unknown service xray.app.router.command.RoutingService

    "api": {
      "services": [
        "RoutingService"
      ]
    },

@mzbqhbc
Copy link

mzbqhbc commented Apr 11, 2024

RoutingService

I run the command line and get this error failed to perform AddRule: rpc error: code = Unimplemented desc = unknown service xray.app.router.command.RoutingService

    "api": {
      "services": [
        "RoutingService"
      ]
    },

Thanks

vrnobody pushed a commit to vrnobody/Xray-core that referenced this pull request Apr 15, 2024
Revert "API - Add | Remove Routing Rules (XTLS#3189)"
31d28c3 
This reverts commit 53e5814.

Because this commit conflict with api getr/setr.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuhan6665 yuhan6665 yuhan6665 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@hossinasaadi @Fangliding @vrnobody @yuhan6665 @mzbqhbc