Skip to content

Feature implementation from commits 33a4336..0563c97#3

Open
codeOwlAI wants to merge 15 commits intofeature-base-branch-3from
feature-head-branch-3
Open

Feature implementation from commits 33a4336..0563c97#3
codeOwlAI wants to merge 15 commits intofeature-base-branch-3from
feature-head-branch-3

Conversation

@codeOwlAI
Copy link
Owner

@codeOwlAI codeOwlAI commented Jun 30, 2025 •
edited by codeowlai bot
Loading

PR Summary

Add JSON Marshaling Support and Enhance Protocol Buffer Messages

Overview

This PR adds JSON marshaling/unmarshaling capabilities to existing types and enhances Protocol Buffer messages with a new system field for CustomSockopt.

Change Types

Type Description
Enhancement Added JSON marshaling support for FakeDNSConfig
Documentation Added documentation for StringList's UnmarshalJSON
Feature Added new system field to CustomSockopt message

Affected Modules

Module / File Change Description
conf/common.go Added documentation for StringList's UnmarshalJSON implementation
conf/fakedns.go Added MarshalJSON method to FakeDNSConfig struct
internet/config.pb.go Added new system field to CustomSockopt message and reordered field numbers
internet/config.pb.go Added GetSystem() getter method to CustomSockopt struct

Breaking Changes

  • Reordering of field numbers in CustomSockopt Protocol Buffer message changes the binary serialization format

Notes for Reviewers

  • The CustomSockopt field reordering may impact backward compatibility with existing serialized data
  • Verify that the FakeDNSConfig JSON marshaling correctly handles both pool and pools fields

dependabot bot and others added 15 commits April 7, 2025 10:30
@dependabot
Bump google.golang.org/grpc from 1.71.0 to 1.71.1 (XTLS#4577)
dd2a40e 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.71.0 to 1.71.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.71.0...v1.71.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/sys from 0.31.0 to 0.32.0 (XTLS#4595)
8b2fe32 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.31.0 to 0.32.0.
- [Commits](golang/sys@v0.31.0...v0.32.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/sync from 0.12.0 to 0.13.0 (XTLS#4596)
ab15822 
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.12.0 to 0.13.0.
- [Commits](golang/sync@v0.12.0...v0.13.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/crypto from 0.36.0 to 0.37.0 (XTLS#4597)
0dbab7b 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.36.0 to 0.37.0.
- [Commits](golang/crypto@v0.36.0...v0.37.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ragavpr
Config: Implement missing MarshalJSON for structs having custom Unmar…
2d3126b 
…shalJSON (XTLS#4585)

* conf: implement MarshalJSON for FakeDNSConfig

* conf: Rewrite MarshalJSON for PortList
decouple PortRange from PortList.

* conf: implement MarshalJSON for HostAddress

* conf: Add MarshalJSON comments and use pointers.
@xqzr
Sockopt: Use Windows syscall (XTLS#4581)
78a1e37
@dependabot
Bump golang.org/x/net from 0.38.0 to 0.39.0 (XTLS#4598)
19e884b 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.38.0 to 0.39.0.
- [Commits](golang/net@v0.38.0...v0.39.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/cloudflare/circl from 1.6.0 to 1.6.1 (XTLS#4602)
53552d7 
Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/cloudflare/circl/releases)
- [Commits](cloudflare/circl@v1.6.0...v1.6.1)

---
updated-dependencies:
- dependency-name: github.com/cloudflare/circl
  dependency-version: 1.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Cl-He-O
Fix issues related to android client (XTLS#4616)
7a2f42f 
* WireGuard: Fix tunnel not closed

* Dialer: Apply controllers in lc.Control
@Fangliding
Sockopt: Allow customSockopt work for Windows & Darwin (XTLS#4576)
5f3ae64 
* Sockopt: Add custom sockopt on Windows & Darwin

* fix windows udp by the way

* use resolved addr

XTLS#4504 (comment)
@RPRX
README.md: Add Loon to Others
8212325 
https://t.me/LoonNews/1662
@RPRX
README.md: Rename Clash.Meta to mihomo in Others
2916b1b
@RPRX
XHTTP client: Set packet-up as the default mode (auto) when using TLS
0995fa4 
https://t.me/projectXtls/929
@xqzr
Sockopt: Fix Windows IP_MULTICAST_IF & IPV6_MULTICAST_IF (XTLS#4627)
907a182 
Completes XTLS#4568
@dependabot
Bump google.golang.org/grpc from 1.71.1 to 1.72.0 (XTLS#4640)
0563c97 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.71.1 to 1.72.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.71.1...v1.72.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.72.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@codeOwlAI @ragavpr @xqzr @Cl-He-O @Fangliding @RPRX