Upgrade to Go 1.23.5

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.29.0 to 0.33.0.
- [Commits](https://github.com/golang/net/compare/v0.29.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.23.4'
+          go-version: '1.23.5'
 
       - name: Install golint
         run: go install golang.org/x/lint/golint@latest

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.23.4"
+          go-version: "1.23.5"
 
       - run: bash .cross_compile.sh
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.4 AS builder
+FROM golang:1.23.5 AS builder
 WORKDIR /go/src/github.com/OwO-Network/DeepLX
 COPY . .
 RUN go get -d -v ./

go.mod

@@ -1,6 +1,6 @@
 module github.com/OwO-Network/DeepLX
 
-go 1.23.4
+go 1.23.5
 
 require (
 	github.com/abadojack/whatlanggo v1.0.1
@@ -48,7 +48,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

go.sum

@@ -122,8 +122,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

translate/translate.go

@@ -2,7 +2,7 @@
  * @Author: Vincent Young
  * @Date: 2024-09-16 11:59:24
  * @LastEditors: Vincent Yang
- * @LastEditTime: 2024-12-03 11:23:23
+ * @LastEditTime: 2025-01-20 17:09:59
  * @FilePath: /DeepLX/translate/translate.go
  * @Telegram: https://t.me/missuo
  * @GitHub: https://github.com/missuo
@@ -126,87 +126,79 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 		}, nil
 	}
 
-	// Split text first
-	splitResult, err := splitText(text, tagHandling == "html" || tagHandling == "xml", proxyURL, dlSession)
-	if err != nil {
-		return DeepLXTranslationResult{
-			Code:    http.StatusServiceUnavailable,
-			Message: err.Error(),
-		}, nil
-	}
+	// Split text by newlines and store them for later reconstruction
+	textParts := strings.Split(text, "\n")
+	var translatedParts []string
+	var allAlternatives [][]string // Store alternatives for each part
 
-	// Get detected language if source language is auto
-	if sourceLang == "auto" || sourceLang == "" {
-		sourceLang = strings.ToUpper(whatlanggo.DetectLang(text).Iso6391())
-	}
-
-	// Prepare jobs from split result
-	var jobs []Job
-	chunks := splitResult.Get("result.texts.0.chunks").Array()
-	for idx, chunk := range chunks {
-		sentence := chunk.Get("sentences.0")
-
-		// Handle context
-		contextBefore := []string{}
-		contextAfter := []string{}
-		if idx > 0 {
-			contextBefore = []string{chunks[idx-1].Get("sentences.0.text").String()}
-		}
-		if idx < len(chunks)-1 {
-			contextAfter = []string{chunks[idx+1].Get("sentences.0.text").String()}
+	for _, part := range textParts {
+		if strings.TrimSpace(part) == "" {
+			translatedParts = append(translatedParts, "")
+			allAlternatives = append(allAlternatives, []string{""})
+			continue
 		}
 
-		jobs = append(jobs, Job{
-			Kind:               "default",
-			PreferredNumBeams:  4,
-			RawEnContextBefore: contextBefore,
-			RawEnContextAfter:  contextAfter,
-			Sentences: []Sentence{{
-				Prefix: sentence.Get("prefix").String(),
-				Text:   sentence.Get("text").String(),
-				ID:     idx + 1,
-			}},
-		})
-	}
+		// Split text first
+		splitResult, err := splitText(part, tagHandling == "html" || tagHandling == "xml", proxyURL, dlSession)
+		if err != nil {
+			return DeepLXTranslationResult{
+				Code:    http.StatusServiceUnavailable,
+				Message: err.Error(),
+			}, nil
+		}
 
-	hasRegionalVariant := false
-	targetLangCode := targetLang
-	targetLangParts := strings.Split(targetLang, "-")
-	if len(targetLangParts) > 1 {
-		targetLangCode = targetLangParts[0]
-		hasRegionalVariant = true
-	}
+		// Get detected language if source language is auto
+		if sourceLang == "auto" || sourceLang == "" {
+			sourceLang = strings.ToUpper(whatlanggo.DetectLang(part).Iso6391())
+		}
 
-	// Prepare translation request
-	id := getRandomNumber()
+		// Prepare jobs from split result
+		var jobs []Job
+		chunks := splitResult.Get("result.texts.0.chunks").Array()
+		for idx, chunk := range chunks {
+			sentence := chunk.Get("sentences.0")
 
-	postData := &PostData{
-		Jsonrpc: "2.0",
-		Method:  "LMT_handle_jobs",
-		ID:      id,
-		Params: Params{
-			CommonJobParams: CommonJobParams{
-				Mode: "translate",
-			},
-			Lang: Lang{
-				SourceLangComputed: strings.ToUpper(sourceLang),
-				TargetLang:         strings.ToUpper(targetLangCode),
-			},
-			Jobs:      jobs,
-			Priority:  1,
-			Timestamp: getTimeStamp(getICount(text)),
-		},
-	}
+			// Handle context
+			contextBefore := []string{}
+			contextAfter := []string{}
+			if idx > 0 {
+				contextBefore = []string{chunks[idx-1].Get("sentences.0.text").String()}
+			}
+			if idx < len(chunks)-1 {
+				contextAfter = []string{chunks[idx+1].Get("sentences.0.text").String()}
+			}
 
-	if hasRegionalVariant {
-		postData = &PostData{
+			jobs = append(jobs, Job{
+				Kind:               "default",
+				PreferredNumBeams:  4,
+				RawEnContextBefore: contextBefore,
+				RawEnContextAfter:  contextAfter,
+				Sentences: []Sentence{{
+					Prefix: sentence.Get("prefix").String(),
+					Text:   sentence.Get("text").String(),
+					ID:     idx + 1,
+				}},
+			})
+		}
+
+		hasRegionalVariant := false
+		targetLangCode := targetLang
+		targetLangParts := strings.Split(targetLang, "-")
+		if len(targetLangParts) > 1 {
+			targetLangCode = targetLangParts[0]
+			hasRegionalVariant = true
+		}
+
+		// Prepare translation request
+		id := getRandomNumber()
+
+		postData := &PostData{
 			Jsonrpc: "2.0",
 			Method:  "LMT_handle_jobs",
 			ID:      id,
 			Params: Params{
 				CommonJobParams: CommonJobParams{
-					Mode:            "translate",
-					RegionalVariant: map[bool]string{true: targetLang, false: ""}[hasRegionalVariant],
+					Mode: "translate",
 				},
 				Lang: Lang{
 					SourceLangComputed: strings.ToUpper(sourceLang),
@@ -214,60 +206,111 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 				},
 				Jobs:      jobs,
 				Priority:  1,
-				Timestamp: getTimeStamp(getICount(text)),
+				Timestamp: getTimeStamp(getICount(part)),
 			},
 		}
-	}
 
-	// Make translation request
-	result, err := makeRequest(postData, "LMT_handle_jobs", proxyURL, dlSession)
-	if err != nil {
-		return DeepLXTranslationResult{
-			Code:    http.StatusServiceUnavailable,
-			Message: err.Error(),
-		}, nil
-	}
+		if hasRegionalVariant {
+			postData = &PostData{
+				Jsonrpc: "2.0",
+				Method:  "LMT_handle_jobs",
+				ID:      id,
+				Params: Params{
+					CommonJobParams: CommonJobParams{
+						Mode:            "translate",
+						RegionalVariant: map[bool]string{true: targetLang, false: ""}[hasRegionalVariant],
+					},
+					Lang: Lang{
+						SourceLangComputed: strings.ToUpper(sourceLang),
+						TargetLang:         strings.ToUpper(targetLangCode),
+					},
+					Jobs:      jobs,
+					Priority:  1,
+					Timestamp: getTimeStamp(getICount(part)),
+				},
+			}
+		}
 
-	// Process translation results
-	var alternatives []string
-	var translatedText string
+		// Make translation request
+		result, err := makeRequest(postData, "LMT_handle_jobs", proxyURL, dlSession)
+		if err != nil {
+			return DeepLXTranslationResult{
+				Code:    http.StatusServiceUnavailable,
+				Message: err.Error(),
+			}, nil
+		}
 
-	translations := result.Get("result.translations").Array()
-	if len(translations) > 0 {
-		// Get alternatives
-		numBeams := len(translations[0].Get("beams").Array())
-		for i := 0; i < numBeams; i++ {
-			var altText string
+		// Process translation results
+		var partTranslation string
+		var partAlternatives []string
+
+		translations := result.Get("result.translations").Array()
+		if len(translations) > 0 {
+			// Process main translation
 			for _, translation := range translations {
-				beams := translation.Get("beams").Array()
-				if i < len(beams) {
-					altText += beams[i].Get("sentences.0.text").String()
+				partTranslation += translation.Get("beams.0.sentences.0.text").String() + " "
+			}
+			partTranslation = strings.TrimSpace(partTranslation)
+
+			// Process alternatives
+			numBeams := len(translations[0].Get("beams").Array())
+			for i := 1; i < numBeams; i++ { // Start from 1 since 0 is the main translation
+				var altText string
+				for _, translation := range translations {
+					beams := translation.Get("beams").Array()
+					if i < len(beams) {
+						altText += beams[i].Get("sentences.0.text").String() + " "
+					}
+				}
+				if altText != "" {
+					partAlternatives = append(partAlternatives, strings.TrimSpace(altText))
 				}
 			}
-			if altText != "" {
-				alternatives = append(alternatives, altText)
-			}
 		}
 
-		// Get main translation
-		for _, translation := range translations {
-			translatedText += translation.Get("beams.0.sentences.0.text").String() + " "
+		if partTranslation == "" {
+			return DeepLXTranslationResult{
+				Code:    http.StatusServiceUnavailable,
+				Message: "Translation failed",
+			}, nil
 		}
-		translatedText = strings.TrimSpace(translatedText)
+
+		translatedParts = append(translatedParts, partTranslation)
+		allAlternatives = append(allAlternatives, partAlternatives)
 	}
 
-	if translatedText == "" {
-		return DeepLXTranslationResult{
-			Code:    http.StatusServiceUnavailable,
-			Message: "Translation failed",
-		}, nil
+	// Join all translated parts with newlines
+	translatedText := strings.Join(translatedParts, "\n")
+
+	// Combine alternatives with proper newline handling
+	var combinedAlternatives []string
+	maxAlts := 0
+	for _, alts := range allAlternatives {
+		if len(alts) > maxAlts {
+			maxAlts = len(alts)
+		}
+	}
+
+	// Create combined alternatives preserving line structure
+	for i := 0; i < maxAlts; i++ {
+		var altParts []string
+		for j, alts := range allAlternatives {
+			if i < len(alts) {
+				altParts = append(altParts, alts[i])
+			} else if len(translatedParts[j]) == 0 {
+				altParts = append(altParts, "") // Keep empty lines
+			} else {
+				altParts = append(altParts, translatedParts[j]) // Use main translation if no alternative
+			}
+		}
+		combinedAlternatives = append(combinedAlternatives, strings.Join(altParts, "\n"))
 	}
 
 	return DeepLXTranslationResult{
 		Code:         http.StatusOK,
-		ID:           id,
+		ID:           getRandomNumber(), // Using new ID for the complete translation
 		Data:         translatedText,
-		Alternatives: alternatives,
+		Alternatives: combinedAlternatives,
 		SourceLang:   sourceLang,
 		TargetLang:   targetLang,
 		Method:       map[bool]string{true: "Pro", false: "Free"}[dlSession != ""],