Update main branch changes

README.md

@@ -2,27 +2,7 @@
 
 [![Build Xray-core binding](https://github.com/LorenEteval/Xray-core-python/actions/workflows/wheels.yml/badge.svg?branch=main)](https://github.com/LorenEteval/Xray-core-python/actions/workflows/wheels.yml)
 
-Python bindings for [Xray-core](https://github.com/XTLS/Xray-core), the best v2ray-core with XTLS support. This package
-provides a bridge to start Xray-core client directly from Python on any platform.
-
-Looking for [hysteria](https://github.com/apernet/hysteria) bindings?
-Check [hysteria-python](https://github.com/LorenEteval/hysteria-python).
-
-See the real-world production GUI client that takes advantage of the Python binding:
-[Furious](https://github.com/LorenEteval/Furious).
-
-## Start
-
-To use this binding, please first make sure that:
-
-* You are a Python developer, or your application is associated with this package.
-* You are building a client application. There is no point to use binding on the server side.
-* You want to provide additional abstraction for your client. The core(i.e. Xray-core) will be shipped with your
-  application as dynamic link library, not an executable.
-* This bridge provides functionality to start Xray-core directly from Python string(see the API below). What that means
-  is that the client config stays in memory all the time, and cannot(or very hard to) be inspected. So you can, for
-  example, get a configuration template from a remote server and edit it for a group of specific client and start the
-  service.
+Python bindings for [Xray-core](https://github.com/XTLS/Xray-core).
 
 ## Install
 

setup.py

@@ -14,15 +14,7 @@
 
 
 def getXrayCoreVersion():
-    with open(ROOT_DIR / 'xray-go' / 'core' / 'core.go') as file:
-        content = file.read()
-
-    matches = re.search(
-        r'Version_x byte = (\d+)\s*Version_y byte = (\d+)\s*Version_z byte = (\d+)\s*',
-        content,
-    )
-
-    return '.'.join(matches.group(i) for i in range(1, 4))
+    return '1.8.5'
 
 
 def runCommand(command):

src/xray.cpp

@@ -28,7 +28,13 @@ namespace {
     {
         GoString jsonString{json.data(), static_cast<ptrdiff_t>(json.size())};
 
-        startFromJSON(jsonString);
+        {
+            py::gil_scoped_release release;
+
+            startFromJSON(jsonString);
+
+            py::gil_scoped_acquire acquire;
+        }
     }
 
     PYBIND11_MODULE(xray, m) {
@@ -42,6 +48,6 @@ namespace {
             "Start Xray client with JSON string",
             py::arg("json"));
 
-        m.attr("__version__") = "1.8.4";
+        m.attr("__version__") = "1.8.5";
     }
 }

xray-go/.github/workflows/docker.yml

@@ -11,10 +11,10 @@ jobs:
     permissions:
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository_owner }}/xray-core
           flavor: latest=true
@@ -23,19 +23,19 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - # Add support for more platforms with QEMU (optional)
         # https://github.com/docker/setup-qemu-action
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64

xray-go/.github/workflows/release.yml

@@ -70,12 +70,10 @@ jobs:
     strategy:
       matrix:
         # Include amd64 on all platforms.
-        goos: [windows, freebsd, openbsd, linux, dragonfly, darwin]
+        goos: [windows, freebsd, openbsd, linux, darwin]
         goarch: [amd64, 386]
         exclude:
-          # Exclude i386 on darwin and dragonfly.
-          - goarch: 386
-            goos: dragonfly
+          # Exclude i386 on darwin
           - goarch: 386
             goos: darwin
         include:
@@ -158,7 +156,7 @@ jobs:
       CGO_ENABLED: 0
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Show workflow information 
         run: |

xray-go/.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
           go-version: '1.21'
           check-latest: true
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Restore Cache
         uses: actions/cache/restore@v3
         with:

xray-go/README.md

@@ -76,6 +76,7 @@
 - iOS & macOS arm64
   - [Mango](https://github.com/arror/Mango)
   - [FoXray](https://apps.apple.com/app/foxray/id6448898396)
+  - [Streisand](https://apps.apple.com/app/streisand/id6450534064)
 - macOS arm64 & x64
   - [V2rayU](https://github.com/yanue/V2rayU)
   - [V2RayXS](https://github.com/tzmax/V2RayXS)
@@ -90,6 +91,8 @@
 
 - iOS & macOS arm64
   - [Shadowrocket](https://apps.apple.com/app/shadowrocket/id932747118)
+- Xray Tools
+  - [xray-knife](https://github.com/lilendian0x00/xray-knife)
 - Xray Wrapper
   - [XTLS/libXray](https://github.com/XTLS/libXray)
   - [xtlsapi](https://github.com/hiddify/xtlsapi)

xray-go/app/dispatcher/default.go

@@ -195,7 +195,7 @@ func (d *DefaultDispatcher) shouldOverride(ctx context.Context, result SniffResu
 		protocolString = resComp.ProtocolForDomainResult()
 	}
 	for _, p := range request.OverrideDestinationForProtocol {
-		if strings.HasPrefix(protocolString, p) || strings.HasPrefix(protocolString, p) {
+		if strings.HasPrefix(protocolString, p) || strings.HasPrefix(p, protocolString) {
 			return true
 		}
 		if fkr0, ok := d.fdns.(dns.FakeDNSEngineRev0); ok && protocolString != "bittorrent" && p == "fakedns" &&
@@ -218,11 +218,13 @@ func (d *DefaultDispatcher) Dispatch(ctx context.Context, destination net.Destin
 	if !destination.IsValid() {
 		panic("Dispatcher: Invalid destination.")
 	}
-	ob := &session.Outbound{
-		OriginalTarget: destination,
-		Target:         destination,
+	ob := session.OutboundFromContext(ctx)
+	if ob == nil {
+		ob = &session.Outbound{}
+		ctx = session.ContextWithOutbound(ctx, ob)
 	}
-	ctx = session.ContextWithOutbound(ctx, ob)
+	ob.OriginalTarget = destination
+	ob.Target = destination
 	content := session.ContentFromContext(ctx)
 	if content == nil {
 		content = new(session.Content)
@@ -271,11 +273,13 @@ func (d *DefaultDispatcher) DispatchLink(ctx context.Context, destination net.De
 	if !destination.IsValid() {
 		return newError("Dispatcher: Invalid destination.")
 	}
-	ob := &session.Outbound{
-		OriginalTarget: destination,
-		Target:         destination,
+	ob := session.OutboundFromContext(ctx)
+	if ob == nil {
+		ob = &session.Outbound{}
+		ctx = session.ContextWithOutbound(ctx, ob)
 	}
-	ctx = session.ContextWithOutbound(ctx, ob)
+	ob.OriginalTarget = destination
+	ob.Target = destination
 	content := session.ContentFromContext(ctx)
 	if content == nil {
 		content = new(session.Content)