From 5bbe89bbfde88546605390d9b46e15f7bccba090 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 30 Oct 2021 08:58:39 +0800
Subject: [PATCH] update-10.30

---
 .../luasrc/model/cbi/openclash/servers-config.lua   |  2 ++
 .../luasrc/view/openclash/server_url.htm            | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/luci-app-openclash/luasrc/model/cbi/openclash/servers-config.lua b/luci-app-openclash/luasrc/model/cbi/openclash/servers-config.lua
index 40c28153d..8c7339001 100644
--- a/luci-app-openclash/luasrc/model/cbi/openclash/servers-config.lua
+++ b/luci-app-openclash/luasrc/model/cbi/openclash/servers-config.lua
@@ -287,10 +287,12 @@ o:depends("obfs_vmess", "websocket")
 
 o = s:option(Value, "max_early_data", translate("max-early-data"))
 o.rmempty = true
+o.placeholder = translate("2048")
 o:depends("obfs_vmess", "websocket")
 
 o = s:option(Value, "early_data_header_name", translate("early-data-header-name"))
 o.rmempty = true
+o.placeholder = translate("Sec-WebSocket-Protocol")
 o:depends("obfs_vmess", "websocket")
 
 -- [[ skip-cert-verify ]]--
diff --git a/luci-app-openclash/luasrc/view/openclash/server_url.htm b/luci-app-openclash/luasrc/view/openclash/server_url.htm
index 6c0b3b23f..350970b72 100644
--- a/luci-app-openclash/luasrc/view/openclash/server_url.htm
+++ b/luci-app-openclash/luasrc/view/openclash/server_url.htm
@@ -266,6 +266,9 @@ function import_ssr_url(btn, urlname, sid) {
 			document.getElementsByName('cbid.openclash.' + sid + '.uuid')[0].value = ssm.id;
 			document.getElementsByName('cbid.openclash.' + sid + '.obfs_vmess')[0].value = ssm.net;
 			document.getElementsByName('cbid.openclash.' + sid + '.obfs_vmess')[0].dispatchEvent(event);
+			if (ssm.method) {
+					document.getElementsByName('cbid.openclash.' + sid + '.securitys')[0].value = ssm.method;
+			}
 			if (ssm.net == "tcp") {
 				if (ssm.type && ssm.type != "http") {
 					ssm.type = "none"
@@ -280,8 +283,8 @@ function import_ssr_url(btn, urlname, sid) {
 			if (ssm.net == "ws") {
 				document.getElementsByName('cbid.openclash.' + sid + '.obfs_vmess')[0].value = "websocket";
 				document.getElementsByName('cbid.openclash.' + sid + '.obfs_vmess')[0].dispatchEvent(event);
-				document.getElementsByName('cbid.openclash.' + sid + '.custom')[0].value = ssm.host;
-				document.getElementsByName('cbid.openclash.' + sid + '.path')[0].value = ssm.path;
+				document.getElementsByName('cbid.openclash.' + sid + '.ws_opts_path')[0].value = ssm.path;
+				document.getElementsByName('cbid.openclash.' + sid + '.ws_opts_headers')[0].value = "Host: " + ssm.host;
 				if (ssm.maxearlydata) {
 					document.getElementsByName('cbid.openclash.' + sid + '.max_early_data')[0].value = ssm.maxearlydata;
 				}
@@ -294,8 +297,10 @@ function import_ssr_url(btn, urlname, sid) {
 				document.getElementsByName('cbid.openclash.' + sid + '.h2_path')[0].value = ssm.path;
 			}
 			if (ssm.tls == "tls") {
-				document.getElementsByName('cbid.openclash.' + sid + '.tls')[0].value = true;
-				document.getElementsByName('cbid.openclash.' + sid + '.servername')[0].value = ssm.host;
+				document.getElementsByName('cbid.openclash.' + sid + '.tls')[0].value = "true";
+			}
+			if (ssm.sni) {
+				document.getElementsByName('cbid.openclash.' + sid + '.servername')[0].value = ssm.sni;
 			}
 			s.innerHTML = "<font color='green'><%:Import configuration information successfully.%></font>";
 			return false;