Merge branch 'dev'

samurai-geek · Dec 13, 2024 · becb1f8 · becb1f8
2 parents 80b7180 + 43e1af4
commit becb1f8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Build project
         run: |
           npx wrangler deploy src/worker.js --name bpb-worker-panel --compatibility-flag [nodejs_compat] --compatibility-date 2024-10-26 --dry-run --outdir=dist
-          npx javascript-obfuscator dist/worker.js --output _worker.js
+          npx javascript-obfuscator --split-strings true --split-strings-chunk-length 2 dist/worker.js --output _worker.js
 
       - name: Commit and push built worker
         run: |

diff --git a/_worker.js b/_worker.js
diff --git a/docs/assets/images/Panel.jpg b/docs/assets/images/Panel.jpg
diff --git a/src/helpers/helpers.js b/src/helpers/helpers.js
@@ -57,7 +57,7 @@ export async function handlePanel(request, env) {
 
 export async function fallback(request) {
     const url = new URL(request.url);
-    url.hostname = 'www.speedtest.net';
+    url.hostname = 'speed.cloudflare.com';
     url.protocol = 'https:';
     request = new Request(url, request);
     return await fetch(request);

diff --git a/src/helpers/init.js b/src/helpers/init.js
@@ -4,20 +4,20 @@ export function initializeParams(request, env) {
     const proxyIPs = env.PROXYIP?.split(',').map(proxyIP => proxyIP.trim());
     const url = new URL(request.url);
     const searchParams = new URLSearchParams(url.search);
-    globalThis.panelVersion = '2.7.8';
+    globalThis.panelVersion = '2.8.1';
     globalThis.defaultHttpPorts = ['80', '8080', '2052', '2082', '2086', '2095', '8880'];
     globalThis.defaultHttpsPorts = ['443', '8443', '2053', '2083', '2087', '2096'];
     globalThis.userID = env.UUID;
     globalThis.trojanPassword = env.TROJAN_PASS;
-    globalThis.proxyIP = proxyIPs ? proxyIPs[Math.floor(Math.random() * proxyIPs.length)] : 'bpb.yousef.isegaro.com';
+    globalThis.proxyIP = proxyIPs ? proxyIPs[Math.floor(Math.random() * proxyIPs.length)] : atob('YnBiLnlvdXNlZi5pc2VnYXJvLmNvbQ==');
     globalThis.hostName = request.headers.get('Host');
     globalThis.pathName = url.pathname;
     globalThis.client = searchParams.get('app');
     globalThis.urlOrigin = url.origin;
     globalThis.dohURL = env.DOH_URL || 'https://cloudflare-dns.com/dns-query';
     if (pathName !== '/secrets') {
-        if (typeof env.bpb !== 'object') throw new Error('KV Dataset is not properly set! Please refer to tutorials.', { cause: "init"});
-        if (!userID || !trojanPassword) throw new Error(`Please set UUID and Trojan password first. Please go to 🟢 https://${hostName}/secrets 🟢 to generate them.`, { cause: "init"});
+        if (!userID || !trojanPassword) throw new Error(`Please set UUID and Trojan password first. Please visit <a href="https://${hostName}/secrets" target="_blank">here</a> to generate them.`, { cause: "init"});
         if (userID && !isValidUUID(userID)) throw new Error(`Invalid UUID: ${userID}`, { cause: "init"});
+        if (typeof env.bpb !== 'object') throw new Error('KV Dataset is not properly set! Please refer to tutorials.', { cause: "init"});
     }
 }
diff --git a/src/kv/handlers.js b/src/kv/handlers.js
@@ -36,7 +36,6 @@ export async function updateDataset (request, env) {
             throw new Error(`An error occurred while getting current KV settings - ${error}`);
         }
     } else {
-        await env.bpb.delete('warpConfigs');
         newSettings = null;
     }
 
@@ -115,7 +114,8 @@ export async function updateDataset (request, env) {
     };
 
     try {    
-        await env.bpb.put("proxySettings", JSON.stringify(proxySettings));          
+        await env.bpb.put("proxySettings", JSON.stringify(proxySettings));
+        if (isReset) await updateWarpConfigs(request, env);          
     } catch (error) {
         console.log(error);
         throw new Error(`An error occurred while updating KV - ${error}`);