test old xray

Author: kastov

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/xtls-sdk",
-  "version": "0.0.8",
+  "version": "0.0.8-dev.1.8.6",
   "description": "A Typescript SDK for XRAY (XTLS) Core GRPC Api",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -56,7 +56,7 @@
     "ts-proto": "^2.2.7",
     "typescript": "^5.6.3"
   },
-  "jest": { 
+  "jest": {
     "moduleFileExtensions": [
       "js",
       "json",
@@ -73,4 +73,4 @@
     "coverageDirectory": "./coverage",
     "testEnvironment": "node"
   }
-}
+}

scripts/export-protos.ts

@@ -6,7 +6,7 @@ import * as tar from 'tar';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 
-const VERSION = '24.11.11';
+const VERSION = '1.8.6';
 const TEMP_DIR = path.join(__dirname, 'temp-xray-core');
 const TARGET_URL = `https://github.com/XTLS/Xray-core/archive/refs/tags/v${VERSION}.tar.gz`;
 

src/common/utils/decode-user/constants/account-types.ts

@@ -1,8 +1,5 @@
 import { Account as TrojanAccount } from '../../../../xray-protos/proxy/trojan/config';
 import { Account as VlessAccount } from '../../../../xray-protos/proxy/vless/account';
-import { Account as ShadowsocksAccount } from '../../../../xray-protos/proxy/shadowsocks/config';
-import { Account as Shadowsocks2022Account } from '../../../../xray-protos/proxy/shadowsocks_2022/config';
-import { Account as SocksAccount } from '../../../../xray-protos/proxy/socks/config';
 import { Account as HttpAccount } from '../../../../xray-protos/proxy/http/config';
 
 export const ACCOUNT_TYPES = {
@@ -22,30 +19,6 @@ export const ACCOUNT_TYPES = {
             encryption: acc.encryption,
         }),
     },
-    [ShadowsocksAccount.$type]: {
-        decoder: ShadowsocksAccount,
-        protocol: 'shadowsocks',
-        getCredentials: (acc: ShadowsocksAccount): Omit<ShadowsocksAccount, '$type'> => ({
-            password: acc.password,
-            cipherType: acc.cipherType,
-            ivCheck: acc.ivCheck,
-        }),
-    },
-    [Shadowsocks2022Account.$type]: {
-        decoder: Shadowsocks2022Account,
-        protocol: 'shadowsocks2022',
-        getCredentials: (acc: Shadowsocks2022Account): Omit<Shadowsocks2022Account, '$type'> => ({
-            key: acc.key,
-        }),
-    },
-    [SocksAccount.$type]: {
-        decoder: SocksAccount,
-        protocol: 'socks',
-        getCredentials: (acc: SocksAccount): Omit<SocksAccount, '$type'> => ({
-            username: acc.username,
-            password: acc.password,
-        }),
-    },
     [HttpAccount.$type]: {
         decoder: HttpAccount,
         protocol: 'http',

src/common/utils/decode-user/types/decoded-user.type.ts

@@ -1,8 +1,6 @@
 import { AccountTypeMapping } from './account-type-mapping.type';
 import { Account as TrojanAccount } from '../../../../xray-protos/proxy/trojan/config';
 import { Account as VlessAccount } from '../../../../xray-protos/proxy/vless/account';
-import { Account as ShadowsocksAccount } from '../../../../xray-protos/proxy/shadowsocks/config';
-import { Account as Shadowsocks2022Account } from '../../../../xray-protos/proxy/shadowsocks_2022/config';
 import { Account as SocksAccount } from '../../../../xray-protos/proxy/socks/config';
 import { Account as HttpAccount } from '../../../../xray-protos/proxy/http/config';
 
@@ -13,7 +11,5 @@ export interface DecodedUser {
     trojan?: Omit<TrojanAccount, '$type'>;
     vless?: Omit<VlessAccount, '$type'>;
     http?: Omit<HttpAccount, '$type'>;
-    shadowsocks?: Omit<ShadowsocksAccount, '$type'>;
-    shadowsocks2022?: Omit<Shadowsocks2022Account, '$type'>;
     socks?: Omit<SocksAccount, '$type'>;
 }

src/handler/handler.service.ts

@@ -9,20 +9,10 @@ import { User } from '../xray-protos/common/protocol/user';
 import createTypedMessage from '../common/utils/create-typed-message/create-typed-message';
 import { ISdkResponse } from '../common/types/sdk-response';
 import { HANDLER_ERRORS } from '../common/errors';
-import { AddUserResponseModel, GetInboundUsersResponseModel } from './models';
-import {
-    IAddHttpUser,
-    IAddShadowsocks2022User,
-    IAddShadowsocksUser,
-    IAddSocksUser,
-    IAddTrojanUser,
-    IAddVlessUser,
-} from './interfaces';
+import { AddUserResponseModel } from './models';
+import { IAddHttpUser, IAddTrojanUser, IAddVlessUser } from './interfaces';
 import { Account as TrojanAccount } from '../xray-protos/proxy/trojan/config';
 import { Account as VlessAccount } from '../xray-protos/proxy/vless/account';
-import { Account as ShadowsocksAccount } from '../xray-protos/proxy/shadowsocks/config';
-import { Account as Shadowsocks2022Account } from '../xray-protos/proxy/shadowsocks_2022/config';
-import { Account as SocksAccount } from '../xray-protos/proxy/socks/config';
 import { Account as HttpAccount } from '../xray-protos/proxy/http/config';
 import { RemoveUserResponseModel } from './models/remove-user/remove-user.response.model';
 
@@ -36,47 +26,6 @@ export class HandlerService {
         this.client = createClient(HandlerServiceDefinition, channel);
     }
 
-    /**
-     * Retrieves all users from a specified inbound handler.
-     * This method fetches user information including their credentials and metadata from the Xray server.
-     *
-     * @param {string} tag - The tag identifying the inbound handler to query
-     * @returns {Promise<ISdkResponse<GetInboundUsersResponseModel>>} A promise that resolves to:
-     * - On success: An object with `isOk: true` and `data` containing an array of decoded user information
-     * - On failure: An object with `isOk: false` and error details from HANDLER_ERRORS
-     *
-     * @example
-     * ```typescript
-     * const handler = new HandlerService(channel);
-     * const response = await handler.getInboundUsers('Personal');
-     *
-     * if (response.isOk) {
-     *   console.log(response.data.users); // Array of DecodedUser objects
-     * } else {
-     *   console.error(response.message); // Error message
-     * }
-     * ```
-     */
-    public async getInboundUsers(tag: string): Promise<ISdkResponse<GetInboundUsersResponseModel>> {
-        try {
-            const response = await this.client.getInboundUsers({ tag });
-
-            return {
-                isOk: true,
-                data: new GetInboundUsersResponseModel(response.users),
-            };
-        } catch (error) {
-            let message = '';
-            if (error instanceof Error) {
-                message = error.message;
-            }
-            return {
-                isOk: false,
-                ...HANDLER_ERRORS.GET_ALL_USERS_ERROR(message),
-            };
-        }
-    }
-
     /**
      * Adds a new Trojan user to a specified inbound handler.
      *
@@ -173,154 +122,6 @@ export class HandlerService {
         }
     }
 
-    /**
-     * Adds a new Shadowsocks user to a specified inbound handler.
-     *
-     * @param {IAddShadowsocksUser} data - The user data containing tag, username, password, cipher type, IV check and level
-     * @returns {Promise<ISdkResponse<AddUserResponseModel>>} A promise that resolves to:
-     * - On success: An object with `isOk: true` and `data.success` indicating if user was added
-     * - On failure: An object with `isOk: false` and error details from HANDLER_ERRORS
-     */
-    public async addShadowsocksUser(
-        data: IAddShadowsocksUser,
-    ): Promise<ISdkResponse<AddUserResponseModel>> {
-        try {
-            const response = await this.client.alterInbound({
-                tag: data.tag,
-                operation: createTypedMessage(AddUserOperation, {
-                    user: User.create({
-                        email: data.username,
-                        level: data.level,
-                        account: createTypedMessage(ShadowsocksAccount, {
-                            password: data.password,
-                            cipherType: data.cipherType,
-                            ivCheck: data.ivCheck,
-                        }),
-                    }),
-                }),
-            });
-
-            return {
-                isOk: true,
-                data: new AddUserResponseModel(true),
-            };
-        } catch (error) {
-            let message = '';
-            if (error instanceof Error) {
-                message = error.message;
-            }
-
-            if (message.includes('already exists')) {
-                return {
-                    isOk: true,
-                    data: new AddUserResponseModel(false),
-                };
-            }
-
-            return {
-                isOk: false,
-                ...HANDLER_ERRORS.ADD_USER_ERROR(message),
-            };
-        }
-    }
-
-    /**
-     * Adds a new Shadowsocks 2022 user to a specified inbound handler.
-     *
-     * @param {IAddShadowsocks2022User} data - The user data containing tag, username, key and level
-     * @returns {Promise<ISdkResponse<AddUserResponseModel>>} A promise that resolves to:
-     * - On success: An object with `isOk: true` and `data.success` indicating if user was added
-     * - On failure: An object with `isOk: false` and error details from HANDLER_ERRORS
-     */
-    public async addShadowsocks2022User(
-        data: IAddShadowsocks2022User,
-    ): Promise<ISdkResponse<AddUserResponseModel>> {
-        try {
-            const response = await this.client.alterInbound({
-                tag: data.tag,
-                operation: createTypedMessage(AddUserOperation, {
-                    user: User.create({
-                        email: data.username,
-                        level: data.level,
-                        account: createTypedMessage(Shadowsocks2022Account, {
-                            key: data.key,
-                        }),
-                    }),
-                }),
-            });
-
-            return {
-                isOk: true,
-                data: new AddUserResponseModel(true),
-            };
-        } catch (error) {
-            let message = '';
-            if (error instanceof Error) {
-                message = error.message;
-            }
-
-            if (message.includes('already exists')) {
-                return {
-                    isOk: true,
-                    data: new AddUserResponseModel(false),
-                };
-            }
-
-            return {
-                isOk: false,
-                ...HANDLER_ERRORS.ADD_USER_ERROR(message),
-            };
-        }
-    }
-
-    /**
-     * Adds a new SOCKS user to a specified inbound handler.
-     *
-     * @param {IAddSocksUser} data - The user data containing tag, username, SOCKS username, SOCKS password and level
-     * @returns {Promise<ISdkResponse<AddUserResponseModel>>} A promise that resolves to:
-     * - On success: An object with `isOk: true` and `data.success` indicating if user was added
-     * - On failure: An object with `isOk: false` and error details from HANDLER_ERRORS
-     */
-    public async addSocksUser(data: IAddSocksUser): Promise<ISdkResponse<AddUserResponseModel>> {
-        try {
-            const response = await this.client.alterInbound({
-                tag: data.tag,
-                operation: createTypedMessage(AddUserOperation, {
-                    user: User.create({
-                        email: data.username,
-                        level: data.level,
-                        account: createTypedMessage(SocksAccount, {
-                            username: data.socks_username,
-                            password: data.socks_password,
-                        }),
-                    }),
-                }),
-            });
-
-            return {
-                isOk: true,
-                data: new AddUserResponseModel(true),
-            };
-        } catch (error) {
-            let message = '';
-            if (error instanceof Error) {
-                message = error.message;
-            }
-
-            if (message.includes('already exists')) {
-                return {
-                    isOk: true,
-                    data: new AddUserResponseModel(false),
-                };
-            }
-
-            return {
-                isOk: false,
-                ...HANDLER_ERRORS.ADD_USER_ERROR(message),
-            };
-        }
-    }
-
     /**
      * Adds a new HTTP user to a specified inbound handler.
      *
@@ -411,31 +212,4 @@ export class HandlerService {
             };
         }
     }
-
-    /**
-     * Gets the count of users in a specified inbound handler.
-     *
-     * @param {string} tag - The tag identifying the inbound handler
-     * @returns {Promise<ISdkResponse<number>>} A promise that resolves to:
-     * - On success: An object with `isOk: true` and `data` containing the user count
-     * - On failure: An object with `isOk: false` and error details from HANDLER_ERRORS
-     */
-    public async getInboundUsersCount(tag: string): Promise<ISdkResponse<number>> {
-        try {
-            const response = await this.client.getInboundUsersCount({ tag });
-            return {
-                isOk: true,
-                data: response.count,
-            };
-        } catch (error) {
-            let message = '';
-            if (error instanceof Error) {
-                message = error.message;
-            }
-            return {
-                isOk: false,
-                ...HANDLER_ERRORS.GET_INBOUND_USERS_COUNT_ERROR(message),
-            };
-        }
-    }
 }

src/handler/models/get-inbound-users/get-inbound-users.response.model.ts

@@ -1,3 +1,2 @@
-export * from './get-inbound-users';
 export * from './add-user';
 export * from './remove-user';