feat: improve website create function and interface (#11331)

* feat: improve website create function and interface

* feat: update website create tag

* feat: update i18n files

* feat: update valid domain regex

* feat: reorder website types to improve structure

* feat: update domain labels for consistency in the domain creation form

* feat: update i18n

Author: HynoR

agent/app/service/website_utils.go

@@ -1107,7 +1107,7 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultHTTPPort, default
 		if domain.Domain == "" {
 			continue
 		}
-		if !common.IsValidDomain(domain.Domain) {
+		if !common.IsValidNginxServerName(domain.Domain) {
 			err = buserr.WithName("ErrDomainFormat", domain.Domain)
 			return
 		}

agent/utils/common/common.go

@@ -306,6 +306,10 @@ func IsValidDomain(domain string) bool {
 	return re.GetRegex(re.DomainPattern).MatchString(domain)
 }
 
+func IsValidNginxServerName(serverName string) bool {
+	return re.GetRegex(re.NginxServerNamePattern).MatchString(serverName)
+}
+
 func ContainsChinese(text string) bool {
 	for _, char := range text {
 		if unicode.Is(unicode.Han, char) {

agent/utils/re/re.go

@@ -14,6 +14,7 @@ const (
 	ValidatorNamePattern               = `^[a-zA-Z\p{Han}]{1}[a-zA-Z0-9_\p{Han}]{0,30}$`
 	ValidatorIPPattern                 = `^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$`
 	DomainPattern                      = `^([\w\p{Han}\-\*]{1,100}\.){1,10}([\w\p{Han}\-]{1,24}|[\w\p{Han}\-]{1,24}\.[\w\p{Han}\-]{1,24})(:\d{1,5})?$`
+	NginxServerNamePattern             = `^(?:\*|[\w\p{Han}-]{1,63})(?:\.(?:\*|[\w\p{Han}-]{1,63}))*$`
 	ProxyCacheZonePattern              = `keys_zone=proxy_cache_zone_of_[\w.]+:(\d+)([kmgt]?)`
 	ProxyCacheMaxSizePattern           = `max_size=([0-9.]+)([kmgt]?)`
 	ProxyCacheMaxSizeValidationPattern = `max_size=\d+(\.\d+)?[kmgt]?`
@@ -44,6 +45,7 @@ func Init() {
 		ValidatorNamePattern,
 		ValidatorIPPattern,
 		DomainPattern,
+		NginxServerNamePattern,
 		ProxyCacheZonePattern,
 		ProxyCacheMaxSizePattern,
 		ProxyCacheMaxSizeValidationPattern,

frontend/src/global/mimetype.ts

@@ -458,14 +458,14 @@ export const getWebsiteTypes = () => [
         label: i18n.global.t('runtime.runtime'),
         value: 'runtime',
     },
-    {
-        label: i18n.global.t('website.proxy'),
-        value: 'proxy',
-    },
     {
         label: i18n.global.t('website.static'),
         value: 'static',
     },
+    {
+        label: i18n.global.t('website.proxy'),
+        value: 'proxy',
+    },
     {
         label: i18n.global.t('website.subsite'),
         value: 'subsite',

frontend/src/lang/modules/en.ts

@@ -2640,6 +2640,10 @@ const message = {
         createDb: 'Create Database',
         enableSSLHelper: 'Failure to enable will not affect the creation of the website',
         batchAdd: 'Batch Add Domains',
+        batchInput: 'Batch Input',
+        domainNotFQDN: 'This domain may not be accessible on the public network',
+        domainInvalid: 'Invalid domain format',
+        domainBatchHelper: 'One domain per line, format: domain:port@ssl\nExample: example.com:443@ssl or example.com',
         generateDomain: 'Generate',
         global: 'Global',
         subsite: 'Subsite',

frontend/src/lang/modules/es-es.ts

@@ -2632,6 +2632,11 @@ const message = {
         createDb: 'Crear base de datos',
         enableSSLHelper: 'Si falla, no afectará la creación del sitio',
         batchAdd: 'Añadir múltiples dominios',
+        batchInput: 'Entrada por Lotes',
+        domainNotFQDN: 'Este dominio puede no ser accesible en la red pública',
+        domainInvalid: 'Formato de dominio inválido',
+        domainBatchHelper:
+            'Un dominio por línea, formato: dominio:puerto@ssl\nEjemplo: example.com:443@ssl o example.com',
         generateDomain: 'Generar',
         global: 'Global',
         subsite: 'Subsitio',

frontend/src/lang/modules/ja.ts

@@ -2561,6 +2561,10 @@ const message = {
         createDb: 'データベースを作成',
         enableSSLHelper: 'SSLの有効化に失敗しても、ウェブサイトの作成には影響しません。',
         batchAdd: 'ドメインを一括追加',
+        batchInput: 'バッチ入力',
+        domainNotFQDN: 'このドメインはパブリックネットワークからアクセスできない可能性があります',
+        domainInvalid: 'ドメイン形式が正しくありません',
+        domainBatchHelper: '1行に1ドメイン、形式: domain:port@ssl\n例: example.com:443@ssl または example.com',
         generateDomain: '生成',
         global: 'グローバル',
         subsite: 'サブサイト',

frontend/src/lang/modules/ko.ts

@@ -2516,6 +2516,10 @@ const message = {
         createDb: '데이터베이스 생성',
         enableSSLHelper: 'SSL 활성화 실패는 웹사이트 생성에 영향을 미치지 않습니다.',
         batchAdd: '도메인 일괄 추가',
+        batchInput: '일괄 입력',
+        domainNotFQDN: '이 도메인은 공용 네트워크에서 액세스할 수 없을 수 있습니다',
+        domainInvalid: '도메인 형식이 올바르지 않습니다',
+        domainBatchHelper: '한 줄에 하나의 도메인, 형식: domain:port@ssl\n예: example.com:443@ssl 또는 example.com',
         generateDomain: '생성',
         global: '글로벌',
         subsite: '하위 사이트',

frontend/src/lang/modules/ms.ts

@@ -2617,6 +2617,11 @@ const message = {
         createDb: 'Cipta Pangkalan Data',
         enableSSLHelper: 'Kegagalan mengaktifkan SSL tidak akan menjejaskan penciptaan laman web.',
         batchAdd: 'Tambah Domain Secara Batch',
+        batchInput: 'Input Kelompok',
+        domainNotFQDN: 'Domain ini mungkin tidak boleh diakses di rangkaian awam',
+        domainInvalid: 'Format domain tidak sah',
+        domainBatchHelper:
+            'Satu domain per baris, format: domain:port@ssl\nContoh: example.com:443@ssl atau example.com',
         generateDomain: 'Hasilkan',
         global: 'Global',
         subsite: 'Sublaman',

frontend/src/lang/modules/pt-br.ts

@@ -2622,6 +2622,11 @@ const message = {
         createDb: 'Criar Banco de Dados',
         enableSSLHelper: 'A falha ao ativar o SSL não afetará a criação do site.',
         batchAdd: 'Adicionar Domínios em Lote',
+        batchInput: 'Entrada em Lote',
+        domainNotFQDN: 'Este domínio pode não estar acessível na rede pública',
+        domainInvalid: 'Formato de domínio inválido',
+        domainBatchHelper:
+            'Um domínio por linha, formato: domínio:porta@ssl\nExemplo: example.com:443@ssl ou example.com',
         generateDomain: 'Gerar',
         global: 'Global',
         subsite: 'Subsite',