Add the routing management gRPC API #412

tat5522 · 2021-03-20T13:40:05Z

参照handlerService写了一份控制路由的grpc api。
支持使用gRPC 增加删除改变 RuleObject，BalancerObject。风格基本与handlerservice一致。
原本的RuleObject没有tag属性，此次修改增加了tag属性。用于控制从配置文件加入的RuleObject，不填tag属性时会采用uuid作为RuleObject的tag。原本RuleObject的tag标签改为TargetTag。

Test Case只完成了RuleObject相关的。BalancerObject由于不会添加Outbound所以未能完成。

…he balance was changed

tat5522 · 2021-03-20T14:03:27Z

为啥三个test check过不了。
测试了commit 4e63c22197683deebb6adc91ebef6b7796131b64 也是一样无法通过

AkinoKaede · 2021-03-20T14:23:34Z

4e63c22197683deebb6adc91ebef6b7796131b64

FAIL	github.com/xtls/xray-core/app/router [build failed]

tat5522 · 2021-03-20T14:34:11Z

4e63c22197683deebb6adc91ebef6b7796131b64
FAIL	github.com/xtls/xray-core/app/router [build failed]

缺少geoip.dat文件导致的test测试不过。

panic: open D:\Xray-core\resources\geoip.dat: The system cannot find the path specified.

goroutine 1 [running]:
github.com/xtls/xray-core/common.Must(...)
        D:/Xray-core/common/common.go:26
github.com/xtls/xray-core/app/router_test.init.0()
        D:/Xray-core/app/router/condition_geoip_test.go:21 +0x42c
FAIL    github.com/xtls/xray-core/app/router    0.272s

AkinoKaede · 2021-03-20T14:36:49Z

4e63c22197683deebb6adc91ebef6b7796131b64
FAIL	github.com/xtls/xray-core/app/router [build failed]

缺少geoip.dat文件导致的test测试不过。

panic: open D:\Xray-core\resources\geoip.dat: The system cannot find the path specified.

goroutine 1 [running]:
github.com/xtls/xray-core/common.Must(...)
        D:/Xray-core/common/common.go:26
github.com/xtls/xray-core/app/router_test.init.0()
        D:/Xray-core/app/router/condition_geoip_test.go:21 +0x42c
FAIL    github.com/xtls/xray-core/app/router    0.272s

测试前应该先将 geoip.dat 和 geosite.dat 放入 resources 目录下，GitHub Actions 中的测试完成了此项工作

tat5522 · 2021-03-20T15:07:00Z

4e63c22197683deebb6adc91ebef6b7796131b64
FAIL	github.com/xtls/xray-core/app/router [build failed]

缺少geoip.dat文件导致的test测试不过。

panic: open D:\Xray-core\resources\geoip.dat: The system cannot find the path specified.

goroutine 1 [running]:
github.com/xtls/xray-core/common.Must(...)
        D:/Xray-core/common/common.go:26
github.com/xtls/xray-core/app/router_test.init.0()
        D:/Xray-core/app/router/condition_geoip_test.go:21 +0x42c
FAIL    github.com/xtls/xray-core/app/router    0.272s

测试前应该先将 geoip.dat 和 geosite.dat 放入 resources 目录下，GitHub Actions 中的测试完成了此项工作

Windows 环境测试通过，Macos和ubuntu无法测试通过。

ghost · 2021-03-20T15:36:57Z

app/router/router.go

+	access         sync.RWMutex
 	domainStrategy Config_DomainStrategy
-	rules          []*Rule
+	rules          map[string]*Rule


Golang Map 是无序的，但是 rules 要求有序

ghost · 2021-03-20T15:47:48Z

@tat5522

感谢您的贡献，有几个需要注意的地方需要说明：

Map
一些代码需要格式化（import）。
我个人认为不应修改单个路由规则，而是直接修改整体。

因此，我暂时将此 PR 修改为 work in progress。

tat5522 · 2021-03-20T16:49:59Z

@tat5522

感谢您的贡献，有几个需要注意的地方需要说明：

Map

一些代码需要格式化（import）。

我个人认为不应修改单个路由规则，而是直接修改整体。

因此，我暂时将此 PR 修改为 work in progress。

Map已修改为Slice，取出时采用遍历方式取出需要的RuleObject。
Import的格式化，需要什么格式的？Windows下开发使用go fmt ./...命令格式化似乎会遇到换行符CRLF问题。
修改整体采用API似乎不太容易做到控制单一路由。

ghost · 2021-03-21T04:05:53Z

@tat5522

感谢贡献。请在 #414 中充分讨论后再继续完成此 API。

…test bug.

tat5522 added 2 commits March 20, 2021 20:46

Add the routing management gRPC API

26d3caf

Fix the balancing that did not update the routing rule binding when t…

82aa6b3

…he balance was changed

AkinoKaede requested review from a user, AkinoKaede and RPRX March 20, 2021 13:48

Fix router_test imported but not used

5f78bea

ghost reviewed Mar 20, 2021

View reviewed changes

ghost marked this pull request as draft March 20, 2021 15:37

Router Rules from Map type change to slice

2403673

tat5522 requested a review from a user March 20, 2021 16:56

ghost mentioned this pull request Mar 21, 2021

[Feature] Routing API #414

Closed

Routing API change name and AddRule support index insert.

3b112d9

This was linked to issues Mar 22, 2021

请问有无计划增加动态添加路由规则的grpcAPI? #211

Closed

[Feature] Routing API #414

Closed

tat5522 added 6 commits April 14, 2021 14:14

Merge https://github.com/XTLS/Xray-core into main

d4cf606

implementation routing get and set api.

a0d9fc9

merge 7b7084f commit

987fb9c

implementation routing get and set api.

ebfdcfc

rename variable.

2c10a8f

modify TestDomainSniffing target github => apple .fix domain matcher …

330c7e8

…test bug.

nekohasekai force-pushed the main branch 2 times, most recently from a80df64 to 707efd6 Compare October 22, 2021 09:58

yuhan6665 force-pushed the main branch 3 times, most recently from a6df210 to 05d24d6 Compare April 9, 2023 17:40

yuhan6665 force-pushed the main branch from ab94461 to bb26f85 Compare May 15, 2023 01:14

yuhan6665 force-pushed the main branch 2 times, most recently from c73e413 to a4e80f0 Compare June 7, 2023 16:27

yuhan6665 force-pushed the main branch from 6d31caf to cae9457 Compare February 19, 2024 15:09

yuhan6665 mentioned this pull request Mar 29, 2024

API - Add | Remove Routing Rules #3189

Merged

Fangliding force-pushed the main branch from 2fdd7c1 to c0f3bf6 Compare June 28, 2024 08:15

RPRX force-pushed the main branch 2 times, most recently from b11fcf0 to 7e24239 Compare August 2, 2024 21:48

mmmray force-pushed the main branch from f3dc545 to f0547bc Compare August 12, 2024 10:59

Fangliding force-pushed the main branch from abb654d to 8da6954 Compare August 15, 2024 11:49

RPRX force-pushed the main branch from 8da6954 to b612da2 Compare August 16, 2024 00:59

yuhan6665 force-pushed the main branch from 0d1e4cd to f357245 Compare September 6, 2024 01:42

RPRX force-pushed the main branch from 98a517c to 8809cbd Compare October 18, 2024 02:16

RPRX force-pushed the main branch from 539b641 to b7aacd3 Compare November 2, 2024 21:07

Fangliding force-pushed the main branch from 9d266a3 to 20d16b3 Compare December 6, 2024 14:32

RPRX force-pushed the main branch from 20d16b3 to 3e7002d Compare December 6, 2024 23:50

RPRX force-pushed the main branch 2 times, most recently from 208f801 to db934f0 Compare December 20, 2024 14:36

RPRX force-pushed the main branch from 57dd9c2 to 0658c95 Compare January 1, 2025 11:49

RPRX force-pushed the main branch from 6b6fbcb to 925a985 Compare February 10, 2025 08:26

RPRX force-pushed the main branch from b0fcf5b to 8d46f7e Compare March 2, 2025 13:02

RPRX force-pushed the main branch 3 times, most recently from 8e4f881 to cbade89 Compare September 4, 2025 21:13

RPRX force-pushed the main branch from 8a1d4b0 to 5148c57 Compare September 10, 2025 17:30

RPRX force-pushed the main branch 2 times, most recently from 9ebd6ad to d418401 Compare November 23, 2025 00:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add the routing management gRPC API #412

Add the routing management gRPC API #412

tat5522 commented Mar 20, 2021 •

edited

Loading

Uh oh!

tat5522 commented Mar 20, 2021 •

edited

Loading

Uh oh!

AkinoKaede commented Mar 20, 2021

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

AkinoKaede commented Mar 20, 2021 •

edited

Loading

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

ghost Mar 20, 2021

Uh oh!

ghost commented Mar 20, 2021 •

edited by ghost

Loading

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

ghost commented Mar 21, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Add the routing management gRPC API #412

Are you sure you want to change the base?

Add the routing management gRPC API #412

Conversation

tat5522 commented Mar 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tat5522 commented Mar 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AkinoKaede commented Mar 20, 2021

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

AkinoKaede commented Mar 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

ghost Mar 20, 2021

Choose a reason for hiding this comment

Uh oh!

ghost commented Mar 20, 2021 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tat5522 commented Mar 20, 2021

Uh oh!

ghost commented Mar 21, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tat5522 commented Mar 20, 2021 •

edited

Loading

tat5522 commented Mar 20, 2021 •

edited

Loading

AkinoKaede commented Mar 20, 2021 •

edited

Loading

ghost commented Mar 20, 2021 •

edited by ghost

Loading