@remnawave/xtls-sdk 0.1.2 → 0.1.5

package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts

@@ -3,6 +3,5 @@ export interface IAddSourceIpRule {
     ip: string;
     outbound: string;
     append: boolean;
-    inbound?: string;
 }
 //# sourceMappingURL=add-source-ip-rule.interface.d.ts.map

package/build/src/router/interfaces/add-source-ip-rule.interface.d.ts.map

@@ -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,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"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

@@ -22,7 +22,6 @@ export declare class RouterService {
      * @param dto.outbound - Outbound tag to route matched traffic
      * @param dto.ip - Source IP address to match
      * @param dto.append - Whether to append the rule or replace existing rules
-     * @param dto.inbound - Optional inbound tag to match
      * @returns Promise resolving to response indicating success or failure
      */
     addSrcIpRule(dto: IAddSourceIpRule): Promise<ISdkResponse<AddSourceIpRuleResponseModel>>;

package/build/src/router/router.service.d.ts.map

@@ -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"}
+{"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

@@ -11,6 +11,7 @@ const config_1 = require("../xray-protos/app/router/config");
 const models_1 = require("./models");
 const router_errors_1 = require("../common/errors/router/router.errors");
 const remove_rule_by_rule_tag_1 = require("./models/remove-rule-by-rule-tag");
+const ipaddr_js_1 = __importDefault(require("ipaddr.js"));
 /**
  * Service for managing routing rules in XRAY/XTLS
  * RoutingService is required (enable on XRay Config) to add/remove routing rules.
@@ -31,21 +32,30 @@ class RouterService {
      * @param dto.outbound - Outbound tag to route matched traffic
      * @param dto.ip - Source IP address to match
      * @param dto.append - Whether to append the rule or replace existing rules
-     * @param dto.inbound - Optional inbound tag to match
      * @returns Promise resolving to response indicating success or failure
      */
     async addSrcIpRule(dto) {
         try {
-            const routingRule = {
-                ruleTag: dto.ruleTag,
-                outboundTag: dto.outbound,
-                source: [dto.ip],
-                inboundTag: dto.inbound ? [dto.inbound] : [''],
-                type: 'field',
-            };
+            const ip = ipaddr_js_1.default.parse(dto.ip);
+            const prefix = ip.kind() === 'ipv6' ? 128 : 32;
             await this.client.addRule({
                 config: (0, create_typed_message_1.default)(config_1.Config, {
-                    rule: [routingRule],
+                    rule: [
+                        {
+                            ruleTag: dto.ruleTag,
+                            tag: dto.outbound,
+                            sourceGeoip: [
+                                config_1.GeoIP.fromPartial({
+                                    cidr: [
+                                        config_1.CIDR.fromPartial({
+                                            ip: new Uint8Array(ip.toByteArray()),
+                                            prefix,
+                                        }),
+                                    ],
+                                }),
+                            ],
+                        },
+                    ],
                 }),
                 shouldAppend: dto.append,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/xtls-sdk",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "A Typescript SDK for XRAY (XTLS) Core GRPC Api",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,13 +39,14 @@
     "vmess"
   ],
   "dependencies": {
+    "ipaddr.js": "2.2.0",
     "long": "^5.2.3",
     "nice-grpc": "^2.1.10",
     "protobufjs": "^7.4.0",
-    "tar": "^7.4.3",
     "@bufbuild/protobuf": "^2.2.2"
   },
   "devDependencies": {
+    "tar": "^7.4.3",
     "@types/jest": "^29.5.2",
     "@types/node": "^22.9.0",
     "grpc-tools": "^1.12.4",