@remnawave/xtls-sdk 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts +0 -1
  2. package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts.map +1 -1
  3. package/build/src/router/router.service.d.ts +0 -1
  4. package/build/src/router/router.service.d.ts.map +1 -1
  5. package/build/src/router/router.service.js +19 -9
  6. package/package.json +3 -2
package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts CHANGED
@@ -3,6 +3,5 @@ export interface IAddSourceIpRule {
3
3
  ip: string;
4
4
  outbound: string;
5
5
  append: boolean;
6
- inboundTag?: string;
7
6
  }
8
7
  //# sourceMappingURL=add-source-ip-rule.interface.d.ts.map
package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-source-ip-rule.interface.d.ts","sourceRoot":"","sources":["../../../../src/router/interfaces/add-source-ip-rule.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB"}
1
+ {"version":3,"file":"add-source-ip-rule.interface.d.ts","sourceRoot":"","sources":["../../../../src/router/interfaces/add-source-ip-rule.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACnB"}
package/build/src/router/router.service.d.ts CHANGED
@@ -23,7 +23,6 @@ export declare class RouterService {
23
23
  * @param dto.ip - Source IP address to match
24
24
  * @param dto.append - Whether to append the rule or replace existing rules
25
25
  * @returns Promise resolving to response indicating success or failure
26
- * @param dto.inboundTag - Optional inbound tag to match
27
26
  */
28
27
  addSrcIpRule(dto: IAddSourceIpRule): Promise<ISdkResponse<AddSourceIpRuleResponseModel>>;
29
28
  /**
package/build/src/router/router.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"router.service.d.ts","sourceRoot":"","sources":["../../../src/router/router.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,OAAO,EAAE,MAAM,WAAW,CAAC;AAMlD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AAEpF;;;GAGG;AACH,qBAAa,aAAa;IAOV,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAE9C;;;OAGG;gBAC0B,OAAO,EAAE,OAAO;IAI7C;;;;;;;;;OASG;IACU,YAAY,CACrB,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;IAiCtD;;;;;OAKG;IACU,mBAAmB,CAC5B,GAAG,EAAE,oBAAoB,GAC1B,OAAO,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAC;CAqB7D"}
1
+ {"version":3,"file":"router.service.d.ts","sourceRoot":"","sources":["../../../src/router/router.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,OAAO,EAAE,MAAM,WAAW,CAAC;AAMlD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,OAAO,EAAE,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AAGpF;;;GAGG;AACH,qBAAa,aAAa;IAOV,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAE9C;;;OAGG;gBAC0B,OAAO,EAAE,OAAO;IAI7C;;;;;;;;OAQG;IACU,YAAY,CACrB,GAAG,EAAE,gBAAgB,GACtB,OAAO,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;IA2CtD;;;;;OAKG;IACU,mBAAmB,CAC5B,GAAG,EAAE,oBAAoB,GAC1B,OAAO,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAC;CAqB7D"}
package/build/src/router/router.service.js CHANGED
@@ -11,6 +11,7 @@ const config_1 = require("../xray-protos/app/router/config");
11
11
  const models_1 = require("./models");
12
12
  const router_errors_1 = require("../common/errors/router/router.errors");
13
13
  const remove_rule_by_rule_tag_1 = require("./models/remove-rule-by-rule-tag");
14
+ const ipaddr_js_1 = __importDefault(require("ipaddr.js"));
14
15
  /**
15
16
  * Service for managing routing rules in XRAY/XTLS
16
17
  * RoutingService is required (enable on XRay Config) to add/remove routing rules.
@@ -32,20 +33,29 @@ class RouterService {
32
33
  * @param dto.ip - Source IP address to match
33
34
  * @param dto.append - Whether to append the rule or replace existing rules
34
35
  * @returns Promise resolving to response indicating success or failure
35
- * @param dto.inboundTag - Optional inbound tag to match
36
36
  */
37
37
  async addSrcIpRule(dto) {
38
38
  try {
39
- const routingRule = {
40
- ruleTag: dto.ruleTag,
41
- outboundTag: dto.outbound,
42
- source: [dto.ip],
43
- inboundTag: dto.inboundTag ? [dto.inboundTag] : [],
44
- type: 'field',
45
- };
39
+ const ip = ipaddr_js_1.default.parse(dto.ip);
40
+ const prefix = ip.kind() === 'ipv6' ? 128 : 32;
46
41
  await this.client.addRule({
47
42
  config: (0, create_typed_message_1.default)(config_1.Config, {
48
- rule: [routingRule],
43
+ rule: [
44
+ {
45
+ ruleTag: dto.ruleTag,
46
+ tag: dto.outbound,
47
+ sourceGeoip: [
48
+ config_1.GeoIP.fromPartial({
49
+ cidr: [
50
+ config_1.CIDR.fromPartial({
51
+ ip: new Uint8Array(ip.toByteArray()),
52
+ prefix,
53
+ }),
54
+ ],
55
+ }),
56
+ ],
57
+ },
58
+ ],
49
59
  }),
50
60
  shouldAppend: dto.append,
51
61
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@remnawave/xtls-sdk",
3
- "version": "0.1.4",
3
+ "version": "0.1.5",
4
4
  "description": "A Typescript SDK for XRAY (XTLS) Core GRPC Api",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",
@@ -39,13 +39,14 @@
39
39
  "vmess"
40
40
  ],
41
41
  "dependencies": {
42
+ "ipaddr.js": "2.2.0",
42
43
  "long": "^5.2.3",
43
44
  "nice-grpc": "^2.1.10",
44
45
  "protobufjs": "^7.4.0",
45
- "tar": "^7.4.3",
46
46
  "@bufbuild/protobuf": "^2.2.2"
47
47
  },
48
48
  "devDependencies": {
49
+ "tar": "^7.4.3",
49
50
  "@types/jest": "^29.5.2",
50
51
  "@types/node": "^22.9.0",
51
52
  "grpc-tools": "^1.12.4",