pref: better language support

kentzhu · kentzhu · commit 08c852490f9c · 2024-04-22T23:00:18.000+08:00
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ docker run -d -p 8080:8080 --restart=unless-stopped --name lessapi-duckduckgo le
 **Request Parameters:**
 
 - keyword: Search keyword (required)
-- region: Region (optional) such as wt-wt, us-en, uk-en, ru-ru, etc. Default is wt-wt
+- region: Region (optional) such as en-US, fr-FR, zh-CN, ru-RU, etc. Default is en-US
 - maxCount: Maximum number of results returned (optional) Default is 20
 - viaProxyUrl: The address of the proxy used by the browser (optional) e.g., http://proxy.server:3000 Default is empty
 
diff --git a/docs/de/README.md b/docs/de/README.md
@@ -41,7 +41,7 @@ Einfach, leicht, zuverlässig, Docker-Deployment, einfach zu warten.
 **Anforderungsparameter:**
 
 - keyword: Suchschlüsselwort (Pflichtfeld)
-- region: Region (optional) z.B. wt-wt, us-en, uk-en, ru-ru, usw. Standardwert ist wt-wt
+- region: Region (optional) z.B. en-US, fr-FR, zh-CN, ru-RU, usw. Standardwert ist en-US
 - maxCount: Maximale Rückgabeanzahl (optional) Standardwert ist 20
 - viaProxyUrl: Adresse des Proxys, der vom Browser verwendet wird (optional) z.B. http://proxy.server:3000 Standardwert
   ist leer
diff --git a/docs/es/README.md b/docs/es/README.md
@@ -42,7 +42,7 @@ Es simple, ligero, confiable, se puede desplegar con Docker y fácil de mantener
 **Parámetros de solicitud:**
 
 - keyword: Palabra clave de búsqueda (obligatorio)
-- region: Región (opcional) como wt-wt, us-en, uk-en, ru-ru, etc. El valor predeterminado es wt-wt
+- region: Región (opcional) como en-US, fr-FR, zh-CN, ru-RU, etc. El valor predeterminado es en-US
 - maxCount: Número máximo de resultados devueltos (opcional) El valor predeterminado es 20
 - viaProxyUrl: Dirección del proxy utilizado por el navegador (opcional) como http://proxy.server:3000 El valor
   predeterminado es vacío
diff --git a/docs/fr/README.md b/docs/fr/README.md
@@ -41,7 +41,7 @@ Simple, léger, fiable, déployable via Docker, facile à maintenir.
 **Paramètres de la requête:**
 
 - keyword: Mot-clé de recherche (obligatoire)
-- region: Région (facultatif) wt-wt, us-en, uk-en, ru-ru, etc. La valeur par défaut est wt-wt
+- region: Région (facultatif) en-US, fr-FR, zh-CN, ru-RU, etc. La valeur par défaut est en-US
 - maxCount: Nombre maximal de résultats retournés (facultatif) La valeur par défaut est 20
 - viaProxyUrl: Adresse du proxy utilisé par le navigateur (facultatif) Exemple : http://proxy.server:3000 La valeur par
   défaut est vide
diff --git a/docs/it/README.md b/docs/it/README.md
@@ -40,7 +40,7 @@ offre un'interfaccia API semplice, leggera e affidabile, ed è facilmente manten
 **Parametri della richiesta:**
 
 - keyword: parola chiave da cercare (obbligatorio)
-- region: regione (facoltativo) es. wt-wt, us-en, uk-en, ru-ru, ecc. Il valore predefinito è wt-wt
+- region: regione (facoltativo) es. en-US, fr-FR, zh-CN, ru-RU, ecc. Il valore predefinito è en-US
 - maxCount: numero massimo di risultati restituiti (facoltativo) Il valore predefinito è 20
 - viaProxyUrl: indirizzo del proxy da utilizzare con il browser (facoltativo) ad esempio http://proxy.server:3000 Il
   valore predefinito è vuoto
diff --git a/docs/ja/README.md b/docs/ja/README.md
@@ -40,7 +40,7 @@ playwright と DuckDuckGo 検索エンジンを基に、単純なAPIインター
 **リクエストパラメータ:**
 
 - keyword: 検索キーワード(必須)
-- region: 地域(任意)  wt-wt, us-en, uk-en, ru-ru, など。デフォルト値は wt-wt
+- region: 地域(任意)  en-US, fr-FR, zh-CN, ru-RU, など。デフォルト値は en-US
 - maxCount: 最大返信数(任意)  デフォルト値は 20
 - viaProxyUrl: ブラウザが使用するプロキシのアドレス(任意)  例: http://proxy.server:3000  デフォルト値は空
 
diff --git a/docs/ko/README.md b/docs/ko/README.md
@@ -39,7 +39,7 @@ LessAPI-DuckDuckGo는 DuckDuckGo 검색 엔진을 기반으로 하는 간단한
 **요청 매개 변수:**
 
 - keyword: 검색 키워드(필수)
-- region: 지역(선택)  wt-wt, us-en, uk-en, ru-ru, 등 기본값 wt-wt
+- region: 지역(선택)  en-US, fr-FR, zh-CN, ru-RU, 등 기본값 en-US
 - maxCount: 최대 반환 수(선택)  기본값 20
 - viaProxyUrl: 브라우저가 프록시를 사용하는 주소(선택)  예: http://proxy.server:3000  기본값: 빈 문자열
 
diff --git a/docs/pt/README.md b/docs/pt/README.md
@@ -41,7 +41,7 @@ Simples, leve, confiável, implantado com Docker, fácil de manter.
 **Parâmetros de solicitação:**
 
 - keyword: Palavra-chave de pesquisa (obrigatório)
-- region: Região (opcional) como wt-wt, us-en, uk-en, ru-ru, etc. O valor padrão é wt-wt
+- region: Região (opcional) como en-US, fr-FR, zh-CN, ru-RU, etc. O valor padrão é en-US
 - maxCount: Número máximo de resultados retornados (opcional) O valor padrão é 20
 - viaProxyUrl: Endereço do proxy usado pelo navegador (opcional) como http://proxy.server:3000 O valor padrão é vazio
 
diff --git a/docs/ru/README.md b/docs/ru/README.md
@@ -41,7 +41,7 @@ LessAPI-DuckDuckGo является сервисом API поисковой си
 **Параметры запроса:**
 
 - keyword: поисковые ключевые слова (обязательно)
-- region: регион (опционально)  wt-wt, us-en, uk-en, ru-ru и т.д. Значение по умолчанию wt-wt
+- region: регион (опционально)  en-US, fr-FR, zh-CN, ru-RU и т.д. Значение по умолчанию en-US
 - maxCount: максимальное количество возвращаемых результатов (опционально)  Значение по умолчанию 20
 - viaProxyUrl: адрес прокси для браузера (опционально)  Например, http://proxy.server:3000  Значение по умолчанию пустое
 
diff --git a/docs/zhs/README.md b/docs/zhs/README.md
@@ -49,7 +49,7 @@ docker run -d -p 8080:8080 --restart=unless-stopped --name lessapi-duckduckgo le
 **请求参数:**
 
 - keyword: 搜索关键字(必填)
-- region: 地区(选填)  wt-wt, us-en, uk-en, ru-ru, 等 默认值 wt-wt
+- region: 地区(选填)  en-US, fr-FR, zh-CN, ru-RU, 等 默认值 en-US
 - maxCount: 最大返回数量(选填)  默认值 20
 - viaProxyUrl: 浏览器使用代理的地址(选填) 如 http://proxy.server:3000  默认值 空
 
diff --git a/docs/zht/README.md b/docs/zht/README.md
@@ -42,7 +42,7 @@ LessAPI-DuckDuckGo 是一個搜索引擎API服務。
 **請求參數:**
 
 - keyword: 搜索關鍵字(必填)
-- region: 地區(選填)  wt-wt, us-en, uk-en, ru-ru, 等 預設值 wt-wt
+- region: 地區(選填)  en-US, fr-FR, zh-CN, ru-RU, 等 預設值 en-US
 - maxCount: 最大返回數量(選填)  預設值 20
 - viaProxyUrl: 瀏覽器使用代理的地址(選填) 如 http://proxy.server:3000  預設值 空
 
diff --git a/internal/searchs/browser_support.go b/internal/searchs/browser_support.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/lessapidev/lessapi-duckduckgo/internal/utils"
 	"github.com/playwright-community/playwright-go"
+	"strings"
 )
 
 // NewBrowserContextWithOptions creates a new browser context with options
@@ -27,9 +28,11 @@ func NewBrowserContextWithOptions(opt BrowserOptions) (playwright.BrowserContext
 	}
 
 	// create new context
-	pLocate := opt.Locate
+	pLocate := opt.Language
 	if pLocate == nil {
-		pLocate = playwright.String("en-Us")
+		pLocate = playwright.String("en-US")
+	} else {
+		pLocate = playwright.String(strings.ReplaceAll(*pLocate, "_", "-"))
 	}
 	pViewport := &playwright.Size{
 		Width:  1920,
diff --git a/internal/searchs/browser_support_types.go b/internal/searchs/browser_support_types.go
@@ -4,7 +4,7 @@ package searchs
 type BrowserOptions struct {
 	ProxyServer     *string
 	EnableStealthJs *bool
-	Locate          *string
+	Language        *string
 	viewportWidth   *int
 	viewportHeight  *int
 }
diff --git a/internal/searchs/search_text.go b/internal/searchs/search_text.go
@@ -15,7 +15,7 @@ func SearchText(param types.SearchTextPayload) (*types.SearchTextResponse, error
 		return nil, fmt.Errorf("keyword is required")
 	}
 	if param.Region == "" {
-		param.Region = "wt-wt"
+		param.Region = "en-US"
 	}
 	if param.TimeLimit == "" {
 		param.TimeLimit = ""
@@ -35,7 +35,7 @@ func SearchText(param types.SearchTextPayload) (*types.SearchTextResponse, error
 	browserOpt := BrowserOptions{
 		ProxyServer:     &param.ViaProxyUrl,
 		EnableStealthJs: playwright.Bool(true),
-		Locate:          &param.Region,
+		Language:        &param.Region,
 		viewportWidth:   playwright.Int(1920),
 		viewportHeight:  playwright.Int(1080 - 35),
 	}
diff --git a/internal/types/types.go b/internal/types/types.go
@@ -9,7 +9,7 @@ type ApiResponse[T any] struct {
 type SearchTextPayload struct {
 	// Keywords to search (required)
 	Keyword string `json:"keyword" form:"keyword" validate:"required"`
-	// Region to search (optional) (default "wt-wt")
+	// Region to search (optional) (default "en-US")
 	Region string `json:"region" form:"region"`
 	// Time limit to search (optional) ( "" default all , "d" past day, "w" past week, "m" past month, "y" past year)
 	TimeLimit string `json:"timeLimit" form:"timeLimit"`
diff --git a/resource/openapi.json b/resource/openapi.json
@@ -27,7 +27,7 @@
           {
             "name": "region",
             "in": "query",
-            "description": "locate region. wt-wt, us-en, uk-en, ru-ru, etc. Defaults to \"wt-wt\".",
+            "description": "locate region. en-US, fr-FR, zh-CN, ru-RU, etc. Defaults to \"en-US\".",
             "required": false,
             "schema": {
               "type": "string"

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"github.com/lessapidev/lessapi-duckduckgo/internal/utils"`
`6`	`6`	`"github.com/playwright-community/playwright-go"`
	`7`	`+ "strings"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`// NewBrowserContextWithOptions creates a new browser context with options`
`@@ -27,9 +28,11 @@ func NewBrowserContextWithOptions(opt BrowserOptions) (playwright.BrowserContext`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`// create new context`
`30`		`- pLocate := opt.Locate`
	`31`	`+ pLocate := opt.Language`
`31`	`32`	`if pLocate == nil {`
`32`		`- pLocate = playwright.String("en-Us")`
	`33`	`+ pLocate = playwright.String("en-US")`
	`34`	`+ } else {`
	`35`	`+ pLocate = playwright.String(strings.ReplaceAll(*pLocate, "_", "-"))`
`33`	`36`	`}`
`34`	`37`	`pViewport := &playwright.Size{`
`35`	`38`	`Width: 1920,`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ package searchs`
`4`	`4`	`type BrowserOptions struct {`
`5`	`5`	`ProxyServer *string`
`6`	`6`	`EnableStealthJs *bool`
`7`		`- Locate *string`
	`7`	`+ Language *string`
`8`	`8`	`viewportWidth *int`
`9`	`9`	`viewportHeight *int`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func SearchText(param types.SearchTextPayload) (*types.SearchTextResponse, error`
`15`	`15`	`return nil, fmt.Errorf("keyword is required")`
`16`	`16`	`}`
`17`	`17`	`if param.Region == "" {`
`18`		`- param.Region = "wt-wt"`
	`18`	`+ param.Region = "en-US"`
`19`	`19`	`}`
`20`	`20`	`if param.TimeLimit == "" {`
`21`	`21`	`param.TimeLimit = ""`
`@@ -35,7 +35,7 @@ func SearchText(param types.SearchTextPayload) (*types.SearchTextResponse, error`
`35`	`35`	`browserOpt := BrowserOptions{`
`36`	`36`	`ProxyServer: &param.ViaProxyUrl,`
`37`	`37`	`EnableStealthJs: playwright.Bool(true),`
`38`		`- Locate: &param.Region,`
	`38`	`+ Language: &param.Region,`
`39`	`39`	`viewportWidth: playwright.Int(1920),`
`40`	`40`	`viewportHeight: playwright.Int(1080 - 35),`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`{`
`28`	`28`	`"name": "region",`
`29`	`29`	`"in": "query",`
`30`		`- "description": "locate region. wt-wt, us-en, uk-en, ru-ru, etc. Defaults to \"wt-wt\".",`
	`30`	`+ "description": "locate region. en-US, fr-FR, zh-CN, ru-RU, etc. Defaults to \"en-US\".",`
`31`	`31`	`"required": false,`
`32`	`32`	`"schema": {`
`33`	`33`	`"type": "string"`