v2kit 0.2__tar.gz → 0.4__tar.gz

{v2kit-0.2 → v2kit-0.4}/AUTHORS.md

@@ -5,7 +5,7 @@
 
 # Other Contributors
 ----------
-- [ChatGPT](https://chat.openai.com/) ++
+- [Gemini](https://gemini.google.com) ++
 
 ++ Graphic designer
 

{v2kit-0.2 → v2kit-0.4}/CHANGELOG.md

@@ -5,6 +5,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.4] - 2026-07-02
+### Added
+- `HttpConfig` class
+### Changed
+- `parse` function modified
+- `README.md` updated
+- Test system modified
+## [0.3] - 2026-06-16
+### Added
+- Logo
+- `SocksConfig` class
+- `is_socks` function
+### Changed
+- `README.md` updated
+- Test system modified
+- Dependencies structure modified
+- All config models moved to `models` folder
 ## [0.2] - 2026-06-04
 ### Added
 - `VMESSConfig` class
@@ -33,7 +50,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `encode_subscription` function
 - `decode_subscription` function
 
-[Unreleased]: https://github.com/sepandhaghighi/v2kit/compare/v0.2...dev
+[Unreleased]: https://github.com/sepandhaghighi/v2kit/compare/v0.4...dev
+[0.4]: https://github.com/sepandhaghighi/v2kit/compare/v0.3...v0.4
+[0.3]: https://github.com/sepandhaghighi/v2kit/compare/v0.2...v0.3
 [0.2]: https://github.com/sepandhaghighi/v2kit/compare/v0.1...v0.2
 [0.1]: https://github.com/sepandhaghighi/v2kit/compare/bb5a2cb...v0.1
 

{v2kit-0.2 → v2kit-0.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: v2kit
-Version: 0.2
+Version: 0.4
 Summary: V2Kit: A Lightweight Toolkit for V2Ray Config Manipulation
 Home-page: https://github.com/sepandhaghighi/v2kit
-Download-URL: https://github.com/sepandhaghighi/v2kit/tarball/v0.2
+Download-URL: https://github.com/sepandhaghighi/v2kit/tarball/v0.4
 Author: Sepand Haghighi
 Author-email: me@sepand.tech
 License: MIT
@@ -44,6 +44,7 @@ Dynamic: summary
 
 
 <div align="center">
+<img src="https://github.com/sepandhaghighi/v2kit/raw/main/otherfiles/logo.png" width="350">
 <h1>V2Kit: A Lightweight Toolkit for V2Ray Config Manipulation</h1>
 <br/>
 <a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3"></a>
@@ -95,13 +96,13 @@ V2Kit is a lightweight and extensible Python toolkit for working with V2Ray prox
 ## Installation		
 
 ### Source Code
-- Download [Version 0.2](https://github.com/sepandhaghighi/v2kit/archive/v0.2.zip) or [Latest Source](https://github.com/sepandhaghighi/v2kit/archive/dev.zip)
+- Download [Version 0.4](https://github.com/sepandhaghighi/v2kit/archive/v0.4.zip) or [Latest Source](https://github.com/sepandhaghighi/v2kit/archive/dev.zip)
 - `pip install .`				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install v2kit==0.2`						
+- `pip install v2kit==0.4`						
 
 ## Supported Protocols
 
@@ -113,6 +114,8 @@ V2Kit currently supports the following protocols:
 | VLESS       | ✅         | ✅       | ✅          | ✅           |
 | Trojan      | ✅         | ✅       | ✅          | ✅           |
 | Shadowsocks | ✅         | ✅       | ✅          | ✅           |
+| SOCKS       | ✅         | ✅       | ✅          | ✅           |
+| HTTP        | ✅         | ✅       | ✅          | ✅           |
 
 
 ## Usage
@@ -208,6 +211,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.4] - 2026-07-02
+### Added
+- `HttpConfig` class
+### Changed
+- `parse` function modified
+- `README.md` updated
+- Test system modified
+## [0.3] - 2026-06-16
+### Added
+- Logo
+- `SocksConfig` class
+- `is_socks` function
+### Changed
+- `README.md` updated
+- Test system modified
+- Dependencies structure modified
+- All config models moved to `models` folder
 ## [0.2] - 2026-06-04
 ### Added
 - `VMESSConfig` class
@@ -236,7 +256,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `encode_subscription` function
 - `decode_subscription` function
 
-[Unreleased]: https://github.com/sepandhaghighi/v2kit/compare/v0.2...dev
+[Unreleased]: https://github.com/sepandhaghighi/v2kit/compare/v0.4...dev
+[0.4]: https://github.com/sepandhaghighi/v2kit/compare/v0.3...v0.4
+[0.3]: https://github.com/sepandhaghighi/v2kit/compare/v0.2...v0.3
 [0.2]: https://github.com/sepandhaghighi/v2kit/compare/v0.1...v0.2
 [0.1]: https://github.com/sepandhaghighi/v2kit/compare/bb5a2cb...v0.1
 

{v2kit-0.2 → v2kit-0.4}/README.md

@@ -1,4 +1,5 @@
 <div align="center">
+<img src="https://github.com/sepandhaghighi/v2kit/raw/main/otherfiles/logo.png" width="350">
 <h1>V2Kit: A Lightweight Toolkit for V2Ray Config Manipulation</h1>
 <br/>
 <a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3"></a>
@@ -50,13 +51,13 @@ V2Kit is a lightweight and extensible Python toolkit for working with V2Ray prox
 ## Installation		
 
 ### Source Code
-- Download [Version 0.2](https://github.com/sepandhaghighi/v2kit/archive/v0.2.zip) or [Latest Source](https://github.com/sepandhaghighi/v2kit/archive/dev.zip)
+- Download [Version 0.4](https://github.com/sepandhaghighi/v2kit/archive/v0.4.zip) or [Latest Source](https://github.com/sepandhaghighi/v2kit/archive/dev.zip)
 - `pip install .`				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install v2kit==0.2`						
+- `pip install v2kit==0.4`						
 
 ## Supported Protocols
 
@@ -68,6 +69,8 @@ V2Kit currently supports the following protocols:
 | VLESS       | ✅         | ✅       | ✅          | ✅           |
 | Trojan      | ✅         | ✅       | ✅          | ✅           |
 | Shadowsocks | ✅         | ✅       | ✅          | ✅           |
+| SOCKS       | ✅         | ✅       | ✅          | ✅           |
+| HTTP        | ✅         | ✅       | ✅          | ✅           |
 
 
 ## Usage

{v2kit-0.2 → v2kit-0.4}/SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version       | Supported          |
 | ------------- | ------------------ |
-| 0.2           | :white_check_mark: |
-| < 0.2         | :x:                |
+| 0.4           | :white_check_mark: |
+| < 0.4         | :x:                |
 
 ## Reporting a Vulnerability
 

v2kit-0.2/dev-requirements.txt → v2kit-0.4/requirements-dev.txt

@@ -4,3 +4,5 @@ setuptools>=40.8.0
 vulture>=1.0
 bandit>=1.5.1
 pydocstyle>=6.3.0
+build>=1.1.1
+twine>=4.0.2

{v2kit-0.2 → v2kit-0.4}/setup.py

@@ -1,16 +1,6 @@
 # -*- coding: utf-8 -*-
 """Setup module."""
-from typing import List
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-
-def get_requires() -> List[str]:
-    """Read requirements.txt."""
-    requirements = open("requirements.txt", "r").read()
-    return list(filter(lambda x: x != "", requirements.split()))
+from setuptools import setup
 
 
 def read_description() -> str:
@@ -32,8 +22,8 @@ def read_description() -> str:
 
 setup(
     name='v2kit',
-    packages=['v2kit'],
-    version='0.2',
+    packages=['v2kit', 'v2kit.models'],
+    version='0.4',
     description='V2Kit: A Lightweight Toolkit for V2Ray Config Manipulation',
     long_description=read_description(),
     long_description_content_type='text/markdown',
@@ -41,11 +31,11 @@ setup(
     author='Sepand Haghighi',
     author_email='me@sepand.tech',
     url='https://github.com/sepandhaghighi/v2kit',
-    download_url='https://github.com/sepandhaghighi/v2kit/tarball/v0.2',
-    keywords="v2ray v2ray-config v2ray-tools vmess vless trojan shadowsocks proxy subscription network",
+    download_url='https://github.com/sepandhaghighi/v2kit/tarball/v0.4',
+    keywords='v2ray v2ray-config v2ray-tools vmess vless trojan shadowsocks proxy subscription network',
     project_urls={
         'Source': 'https://github.com/sepandhaghighi/v2kit'},
-    install_requires=get_requires(),
+    install_requires=[],
     python_requires='>=3.8',
     classifiers=[
         'Development Status :: 3 - Alpha',

{v2kit-0.2 → v2kit-0.4}/tests/test_errors.py

@@ -1,16 +1,18 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from v2kit import VMESSConfig, VLESSConfig, TrojanConfig, ShadowsocksConfig
+from v2kit import VMESSConfig, VLESSConfig, TrojanConfig, ShadowsocksConfig, SocksConfig
 from v2kit import relabel, encode_subscription, decode_subscription, parse
 from v2kit import V2kitError, V2kitValidationError, V2kitParseError
 from v2kit.validators import _validate_uri
 
 
-INVALID_PROTOCOL = "http://example.com"
+INVALID_PROTOCOL = "ftp://example.com"
 
 INVALID_VMESS = "vmess://invalid-base64"
 
+INVALID_SHADOWSOCKS = "ss://invalid-base64@example.com:8388#ss-test"
+
 VALID_VLESS = (
     "vless://1c4b4bca-e3ff-4ca8-a062-6f399ad3cf45@example.com:443"
     "?security=tls#test"
@@ -61,7 +63,7 @@ def test_relabel_non_string_label():
         relabel(VALID_VLESS, 123)
 
 
-def test_encode_subscription_invalid_config():
+def test_encode_subscription_invalid_config1():
     configs = [
         VALID_VLESS,
         "invalid-config",
@@ -71,6 +73,16 @@ def test_encode_subscription_invalid_config():
         encode_subscription(configs)
 
 
+def test_encode_subscription_invalid_config2():
+    configs = [
+        VALID_VLESS,
+        1,
+    ]
+
+    with pytest.raises(V2kitValidationError):
+        encode_subscription(configs)
+
+
 def test_decode_subscription_non_string():
     with pytest.raises(V2kitValidationError):
         decode_subscription(123)
@@ -109,7 +121,17 @@ def test_parse_invalid_uri():
 
 def test_parse_unsupported_protocol():
     with pytest.raises(V2kitParseError):
-        parse("http://example.com")
+        parse(INVALID_PROTOCOL)
+
+
+def test_parse_invalid_vmess():
+    with pytest.raises(V2kitParseError):
+        parse(INVALID_VMESS)
+
+
+def test_parse_invalid_shadowsocks():
+    with pytest.raises(V2kitParseError):
+        parse(INVALID_SHADOWSOCKS)
 
 
 def test_vless_invalid_uuid():
@@ -166,3 +188,37 @@ def test_shadowsocks_empty_encryption():
             address="example.com",
             port=8388,
         )
+
+
+def test_socks_invalid_port():
+    with pytest.raises(V2kitValidationError):
+        SocksConfig(
+            address="example.com",
+            port=70000,
+        )
+
+
+def test_socks_empty_address():
+    with pytest.raises(V2kitValidationError):
+        SocksConfig(
+            address="",
+            port=1080,
+        )
+
+
+def test_socks_invalid_username():
+    with pytest.raises(V2kitValidationError):
+        SocksConfig(
+            address="example.com",
+            port=1080,
+            username="",
+        )
+
+
+def test_socks_invalid_password():
+    with pytest.raises(V2kitValidationError):
+        SocksConfig(
+            address="example.com",
+            port=1080,
+            password="",
+        )

{v2kit-0.2 → v2kit-0.4}/tests/test_functions.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import json
-from v2kit import is_vmess, is_vless, is_trojan, is_shadowsocks, parse
+from v2kit import is_vmess, is_vless, is_trojan, is_shadowsocks, is_socks, is_http, parse
 from v2kit import relabel, encode_subscription, decode_subscription
-from v2kit import VMESSConfig, VLESSConfig, TrojanConfig, ShadowsocksConfig
+from v2kit import VMESSConfig, VLESSConfig, TrojanConfig, ShadowsocksConfig, SocksConfig
 from v2kit.utils import _encode_base64
 
 
@@ -29,19 +29,15 @@ def create_vmess(label="test"):
 
 VMESS_CONFIG = create_vmess()
 
-VLESS_CONFIG = (
-    "vless://1c4b4bca-e3ff-4ca8-a062-6f399ad3cf45@example.com:443"
-    "?security=tls#vless-test"
-)
+VLESS_CONFIG = "vless://1c4b4bca-e3ff-4ca8-a062-6f399ad3cf45@example.com:443?security=tls#vless-test"
 
-TROJAN_CONFIG = (
-    "trojan://password@example.com:443"
-    "?security=tls#trojan-test"
-)
+TROJAN_CONFIG = "trojan://password@example.com:443?security=tls#trojan-test"
 
-SHADOWSOCKS_CONFIG = (
-    "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@example.com:8388#ss-test"
-)
+SHADOWSOCKS_CONFIG = "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@example.com:8388#ss-test"
+
+SOCKS_CONFIG = "socks://user:password@example.com:1080#socks-test"
+
+HTTP_CONFIG = "http://user@example.com:1080#test"
 
 
 def test_is_vmess():
@@ -60,6 +56,10 @@ def test_is_shadowsocks():
     assert is_shadowsocks(SHADOWSOCKS_CONFIG) is True
 
 
+def test_is_http():
+    assert is_http(HTTP_CONFIG) is True
+
+
 def test_is_vmess_negative():
     assert is_vmess(VLESS_CONFIG) is False
 
@@ -80,6 +80,18 @@ def test_is_shadowsocks_invalid():
     assert is_shadowsocks("invalid") is False
 
 
+def test_is_http_invalid():
+    assert is_http("invalid") is False
+
+
+def test_is_socks():
+    assert is_socks(SOCKS_CONFIG) is True
+
+
+def test_is_socks_invalid():
+    assert is_socks("invalid") is False
+
+
 def test_relabel_vmess():
     result = relabel(VMESS_CONFIG, "new-label")
 
@@ -142,6 +154,7 @@ def test_encode_decode_subscription_roundtrip():
         VLESS_CONFIG,
         TROJAN_CONFIG,
         SHADOWSOCKS_CONFIG,
+        SOCKS_CONFIG,
     ]
 
     encoded = encode_subscription(configs)
@@ -206,3 +219,10 @@ def test_parse_shadowsocks():
         parse(SHADOWSOCKS_CONFIG),
         ShadowsocksConfig,
     )
+
+
+def test_parse_socks():
+    assert isinstance(
+        parse(SOCKS_CONFIG),
+        SocksConfig,
+    )

v2kit-0.4/tests/test_http.py

@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+import pytest
+from v2kit import parse
+from v2kit import HttpConfig
+
+
+def test_defaults():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+    )
+
+    assert config.label is None
+    assert config.extra == {}
+    assert config.username is None
+    assert config.password is None
+
+
+def test_to_dict():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+        username="user",
+        password="password",
+        label="test",
+        extra={"foo": "bar"},
+    )
+
+    assert config.to_dict() == {
+        "protocol": "http",
+        "address": "example.com",
+        "port": 1080,
+        "username": "user",
+        "password": "password",
+        "extra": {"foo": "bar"},
+        "label": "test",
+    }
+
+
+def test_extra():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+        extra={"foo": "bar"},
+    )
+
+    data = config.to_dict()
+
+    assert data["extra"]["foo"] == "bar"
+
+
+def test_update_methods():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+    )
+
+    config.update_address("example.org")
+    config.update_port(8080)
+    config.update_username("user")
+    config.update_password("password")
+
+    assert config.address == "example.org"
+    assert config.port == 8080
+    assert config.username == "user"
+    assert config.password == "password"
+
+
+def test_update_extra():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+    )
+
+    config.update_extra(
+        {"foo": "bar"}
+    )
+
+    assert config.extra["foo"] == "bar"
+
+
+def test_method_chaining():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+    )
+
+    config.update_address(
+        "example.org"
+    ).update_port(
+        8080
+    ).update_username(
+        "user"
+    ).update_password(
+        "password"
+    )
+
+    assert config.address == "example.org"
+    assert config.port == 8080
+    assert config.username == "user"
+    assert config.password == "password"
+
+
+@pytest.mark.parametrize(
+    "kwargs",
+    [
+        {"address": ""},
+        {"port": 0},
+        {"port": 1.2},
+        {"username": ""},
+        {"password": ""},
+        {"extra": 1},
+    ],
+)
+def test_invalid_values(kwargs):
+    params = {
+        "address": "example.com",
+        "port": 1080,
+    }
+    params.update(kwargs)
+
+    with pytest.raises(ValueError):
+        HttpConfig(**params)
+
+
+def test_to_uri_roundtrip():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+        username="user",
+        password="password",
+        label="test",
+    )
+
+    parsed = parse(config.to_uri())
+
+    assert parsed == config
+
+
+def test_equality():
+    config1 = HttpConfig(
+        address="example.com",
+        port=1080,
+        username="user",
+        password="password",
+    )
+
+    config2 = HttpConfig(
+        address="example.com",
+        port=1080,
+        username="user",
+        password="password",
+    )
+
+    config3 = HttpConfig(
+        address="example.org",
+        port=1080,
+        username="user",
+        password="password",
+    )
+
+    assert config1 == config2
+    assert config1 != config3
+    assert config1 != "config1"
+
+
+def test_to_uri_without_auth():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+        label="test",
+    )
+
+    assert config.to_uri() == "http://example.com:1080#test"
+
+
+def test_to_uri_username_only():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+        username="user",
+        label="test",
+    )
+
+    assert config.to_uri() == "http://user@example.com:1080#test"
+
+
+def test_repr():
+    config = HttpConfig(
+        address="example.com",
+        port=1080,
+    )
+
+    assert repr(config) == "HttpConfig(protocol=<Protocol.HTTP: 'http'>, label=None)"