fix script

xkww3n · Sep 17, 2024 · 1c2f0e1 · 1c2f0e1
1 parent 33bd316
commit 1c2f0e1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/source/personal/bypass.js b/source/personal/bypass.js
@@ -1 +1,9 @@
-$done($persistentStore.read("bypass"))
+var match = 0
+if ($network.wifi.ssid) {
+    match = $persistentStore.read("bypass_wifi");
+}
+else {
+    match = $persistentStore.read("bypass_cellular");
+}
+
+$done({matched: match});
diff --git a/source/personal/set_bypass.js b/source/personal/set_bypass.js
@@ -5,30 +5,29 @@ const GLOBAL_WIFI = [
     "McDonald's"
 ];
 
-var bypass;
+var bypass_cellular = 0;
+var bypass_wifi = 0;
 
-if ($network.wifi.ssid) {
-    if (GLOBAL_WIFI.includes($network.wifi.ssid)) {
-        bypass = 1;
+try {
+    if ($intent.parameter === "内地") {
+        bypass_cellular = 0;
     }
     else {
-        bypass = 0;
-    };
-    $persistentStore.write(bypass, "bypass");
-    $done();
+        bypass_cellular = 1;
+    }
+    $persistentStore.write(bypass_cellular, "bypass_cellular");
 }
-else {
-    try {
-        if ($indent.parameter === "内地") {
-            bypass = 0;
+catch (err) { // triggered by network-changed event, no `$intent` passed in
+    if ($network.wifi.ssid) {
+        if (GLOBAL_WIFI.includes($network.wifi.ssid)){
+            bypass_wifi = 1;
         }
         else {
-            bypass = 1;
+            bypass_wifi = 0;
         }
-        $persistentStore.write(bypass, "bypass");
-        $done();
-    }
-    catch (err) {
-        $done();
+        $persistentStore.write(bypass_wifi, "bypass_wifi");
     }
 }
+finally {
+    $done();
+}