Merge V1.10.0.1001

.github/workflows/issue-translator.yml

@@ -0,0 +1,15 @@
+name: Issue Translator
+on: 
+  issue_comment: 
+    types: [created]
+  issues: 
+    types: [opened]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: usthe/issues-translate-action@v2.7
+        with:
+          IS_MODIFY_TITLE: true
+          CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.

.github/workflows/linuxbuild.yml

@@ -3,8 +3,6 @@ name: ubuntu build workflows
 on:
   push:
     branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
 
 permissions:
   contents: read
@@ -61,4 +59,10 @@ jobs:
       - name: test
         run: |
             cd XEngine_Release
-            ./XEngine_ProxyServiceApp -t
+            ./XEngine_ProxyServiceApp -t
+
+      - name: Upload folder as artifact with ubuntu
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_ProxyServiceApp-x64-Ubuntu
+          path: XEngine_Release/

.github/workflows/macbuild.yml

@@ -3,8 +3,6 @@ name: macos build workflows
 on:
   push:
     branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
 
 permissions:
   contents: read
@@ -29,6 +27,7 @@ jobs:
         with:
           repository: libxengine/libxengine
           path: libxengine
+          ref: 'master'
 
       - name: sub module checkout (opensource)
         run: |
@@ -62,3 +61,9 @@ jobs:
         run: |
             cd XEngine_Release
             ./XEngine_ProxyServiceApp -t
+
+      - name: Upload folder as artifact with mac
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_ProxyServiceApp-x64-Mac
+          path: XEngine_Release/

.github/workflows/msbuild.yml

@@ -3,9 +3,7 @@ name: windows build workflows
 on:
   push:
     branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
-
+
 permissions:
   contents: read
 
@@ -65,13 +63,27 @@ jobs:
           ./VSCopy_x86.bat
           ./XEngine_ServiceApp.exe -t
         shell: pwsh
-      - name: Conditional Step for x86 Debug
-        if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
+      - name: Conditional Step for x64 Release
+        if: matrix.configuration == 'Release' && matrix.platform == 'x64'
         run: |
-          cp -r XEngine_Source/Debug/*.dll XEngine_Release/
-          cp -r XEngine_Source/Debug/*.exe XEngine_Release/
-          cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
+          cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
+          cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
+          cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
           cd XEngine_Release
-          ./VSCopy_x86.bat
-          ./XEngine_ServiceApp.exe -t
+          ./VSCopy_x64.bat
         shell: pwsh
+
+      #将文件夹打包为 artifact
+      - name: Upload folder as artifact with x86
+        if: matrix.configuration == 'Release' && matrix.platform == 'x86'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_ProxyServiceApp-x86-Windows
+          path: XEngine_Release/
+
+      - name: Upload folder as artifact with x64
+        if: matrix.configuration == 'Release' && matrix.platform == 'x64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_ProxyServiceApp-x64-Windows
+          path: XEngine_Release/

.github/workflows/release.yml

@@ -0,0 +1,96 @@
+name: release packet
+
+on:
+  push:
+    branches: 
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+        # 检出代码并包含标签
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 
+
+      - name: Download linuxbuild
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: linuxbuild.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./
+      - name: Download macbuild
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: macbuild.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./
+      - name: Download msbuild
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: msbuild.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./
+
+      - name: Display structure of downloaded files
+        run: ls -al ./
+
+      # 获取最新的标签并提取 X 部分
+      - name: Get current version and increment X
+        id: versioning
+        run: |
+          # 获取最新的标签，假设标签形式为 V1.X.0.1001
+          latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
+          echo "Latest tag: $latest_tag"
+          # 提取 X 的值并递增
+          major=$(echo $latest_tag | cut -d '.' -f 1)
+          minor=$(echo $latest_tag | cut -d '.' -f 2)
+          patch=$(echo $latest_tag | cut -d '.' -f 3)
+          build=$(echo $latest_tag | cut -d '.' -f 4)
+
+          new_minor=$((minor + 1))
+          new_version="$major.$new_minor.$patch.$build"
+          echo "New version: $new_version"
+          echo "new_tag=$new_version" >> $GITHUB_OUTPUT
+          echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT
+
+      # 创建并推送新的 Git 标签
+      - name: Create and push new tag
+        run: |
+          git tag ${{ steps.versioning.outputs.new_tag }}
+          git push origin ${{ steps.versioning.outputs.new_tag }}
+
+      - name: Generate release notes
+        run: |
+          # 获取当前标签和上一个标签之间的提交列表，包括提交人的电子邮件
+          logs=$(git log ${{ steps.versioning.outputs.prev_tag }}..${{ steps.versioning.outputs.new_tag }} --pretty=format:"* %H - %s - %an" --no-merges)
+          release_notes=$(echo "$logs" | sed 's/ - qyt$/ - @xengine-qyt/')
+          echo "release_notes=$release_notes" >> $GITHUB_ENV
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          draft: false
+          prerelease: false
+          tag_name: ${{ steps.versioning.outputs.new_tag }}
+          name: XEngine_ProxyServiceApp ${{ steps.versioning.outputs.new_tag }}
+          body: ${{ env.release_notes }}
+          files: |
+            ./XEngine_ProxyServiceApp-x64-Mac.zip
+            ./XEngine_ProxyServiceApp-x64-Ubuntu.zip
+            ./XEngine_ProxyServiceApp-x64-Windows.zip
+            ./XEngine_ProxyServiceApp-x86-Windows.zip

CHANGELOG

@@ -1,3 +1,29 @@
+XEngine_ProxyServer V1.10.0.1001
+
+增加:WINDOWS COREDUMP支持
+增加:工作流支持
+增加:启动测试参数
+优化:启动参数解析
+修改:启动测试的时候关闭报告
+修改:forward转发的绑定修改为命名绑定,并且增加了匿名绑定支持
+修正:子模块文件件不正确的问题
+修正:MACOS下编译问题
+修正:某些时候退出崩溃
+修正:forward删除目标客户端导致的问题
+删除:getchar 函数启动的时候
+
+added:crash core-dump support for windows
+added:workflows
+added:test start mode parameter
+improved:start parameter parse
+modify:disable report info when test start
+modify:bind modify to named and add anonymous for forward of bind
+fixed:sub module dir is incorrect
+fixed:make build error on mac
+fixed:crashed when exist
+fixed:delete dest client for forward
+delete:getchar() when test start
+======================================================================================
 XEngine_ProxyServer V1.9.0.1001
 
 增加:XENGINE版本处理和退出等待功能

XEngine_Release/XEngine_Config/XEngine_Version.json

@@ -1,5 +1,6 @@
 {
   "XVer": [
+    "1.10.0.1001 Build20241115",
     "1.9.0.1001 Build20240910",
     "1.8.0.1001 Build20240522",
     "1.7.1.1001 Build20240305",

XEngine_Source/XEngine_ModuleSession/ModuleSession_Define.h

@@ -23,7 +23,9 @@ typedef struct
 	XENGINE_PROTOCOL_USERAUTH st_UserAuth;
 	XCHAR tszSrcAddr[128];
 	XCHAR tszDstAddr[128];
+	XNETHANDLE xhClient;
 	bool bForward;
+	bool bAnony;
 }SESSION_FORWARD, * LPSESSION_FORWARD;
 //////////////////////////////////////////////////////////////////////////
 //                        导出函数
@@ -76,8 +78,8 @@ extern "C" bool ModuleSession_Forward_Insert(LPCXSTR lpszAddr, XENGINE_PROTOCOL_
 *********************************************************************/
 extern "C" bool ModuleSession_Forward_List(SESSION_FORWARD * **pppSt_ListUser, int* pInt_Count, LPCXSTR lpszAddr = NULL);
 /********************************************************************
-函数名称：ModuleSession_Forward_Bind
-函数功能：绑定转发需求
+函数名称：ModuleSession_Forward_BindNamed
+函数功能：命名绑定转发需求
  参数.一：lpszSrcAddr
   In/Out：In
   类型：常量字符指针
@@ -93,7 +95,31 @@ extern "C" bool ModuleSession_Forward_List(SESSION_FORWARD * **pppSt_ListUser, i
   意思：是否成功
 备注：
 *********************************************************************/
-extern "C" bool ModuleSession_Forward_Bind(LPCXSTR lpszSrcAddr, LPCXSTR lpszDstAddr);
+extern "C" bool ModuleSession_Forward_BindNamed(LPCXSTR lpszSrcAddr, LPCXSTR lpszDstAddr);
+/********************************************************************
+函数名称：ModuleSession_Forward_BindNamed
+函数功能：匿名绑定转发需求
+ 参数.一：lpszSrcAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输入绑定的原始地址
+ 参数.二：lpszDstAddr
+  In/Out：In
+  类型：常量字符指针
+  可空：N
+  意思：输出绑定的目标地址
+ 参数.三：xhClient
+  In/Out：In
+  类型：句柄
+  可空：N
+  意思：输入绑定的客户端
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
+extern "C" bool ModuleSession_Forward_BindAnony(LPCXSTR lpszSrcAddr, LPCXSTR lpszDstAddr, XNETHANDLE xhClient);
 /********************************************************************
 函数名称：ModuleSession_Forward_Delete
 函数功能：删除用户
@@ -132,7 +158,6 @@ extern "C" bool ModuleSession_Forward_Delete(LPCXSTR lpszAddr, XCHAR * ptszDstAd
 备注：
 *********************************************************************/
 extern "C" bool ModuleSession_Forward_Get(LPCXSTR lpszAddr, XCHAR* ptszDstAddr = NULL);
-
 /************************************************************************/
 /*                     SOCK代理服务器导出函数                           */
 /************************************************************************/