From 760af582352de2217c05959cdd433b4c895397eb Mon Sep 17 00:00:00 2001
From: Zoupers Zou <1171443643@qq.com>
Date: Sat, 16 Nov 2024 13:37:55 +0800
Subject: [PATCH 1/3] fix: clash wireguard config pre-shared-key key name wrong

---
 src/utils/clash.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/clash.ts b/src/utils/clash.ts
index dd28a1b78..66f0cad15 100644
--- a/src/utils/clash.ts
+++ b/src/utils/clash.ts
@@ -515,7 +515,7 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
         port: getPortFromHost(nodeConfig.peers[0].endpoint),
         'public-key': nodeConfig.peers[0].publicKey,
         ...(nodeConfig.peers[0].presharedKey
-          ? { 'preshared-key': nodeConfig.peers[0].presharedKey }
+          ? { 'pre-shared-key': nodeConfig.peers[0].presharedKey }
           : null),
         ...(nodeConfig.peers[0].reservedBits
           ? {

From 401f4ef9116caa199625fdce8ae1728306ca525f Mon Sep 17 00:00:00 2001
From: Zoupers Zou <1171443643@qq.com>
Date: Tue, 19 Nov 2024 21:37:28 +0800
Subject: [PATCH 2/3] Follow the advice, provide both pre-shared-key and
 preshared-key

---
 src/utils/clash.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/clash.ts b/src/utils/clash.ts
index 66f0cad15..47dd60066 100644
--- a/src/utils/clash.ts
+++ b/src/utils/clash.ts
@@ -515,7 +515,10 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
         port: getPortFromHost(nodeConfig.peers[0].endpoint),
         'public-key': nodeConfig.peers[0].publicKey,
         ...(nodeConfig.peers[0].presharedKey
-          ? { 'pre-shared-key': nodeConfig.peers[0].presharedKey }
+          ? {
+              'pre-shared-key': nodeConfig.peers[0].presharedKey,
+              'preshared-key': nodeConfig.peers[0].presharedKey,
+            }
           : null),
         ...(nodeConfig.peers[0].reservedBits
           ? {

From f43be6287329bc80a5717cf65b73b74abf76ebbb Mon Sep 17 00:00:00 2001
From: Zoupers <qy@zouper.cn>
Date: Thu, 21 Nov 2024 00:08:40 +0800
Subject: [PATCH 3/3] fix: distinguish pre-shared-key by clashCore

---
 src/utils/clash.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/utils/clash.ts b/src/utils/clash.ts
index 47dd60066..35a4efca7 100644
--- a/src/utils/clash.ts
+++ b/src/utils/clash.ts
@@ -515,10 +515,9 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
         port: getPortFromHost(nodeConfig.peers[0].endpoint),
         'public-key': nodeConfig.peers[0].publicKey,
         ...(nodeConfig.peers[0].presharedKey
-          ? {
-              'pre-shared-key': nodeConfig.peers[0].presharedKey,
-              'preshared-key': nodeConfig.peers[0].presharedKey,
-            }
+          ? nodeConfig?.clashConfig?.clashCore === 'clash.meta'
+            ? { 'pre-shared-key': nodeConfig.peers[0].presharedKey }
+            : { 'preshared-key': nodeConfig.peers[0].presharedKey }
           : null),
         ...(nodeConfig.peers[0].reservedBits
           ? {