perf: ensure settings are the right type

theusaf · theusaf · commit 932c1672edb7 · 2023-09-05T12:15:05.000-07:00
diff --git a/README.md b/README.md
@@ -70,6 +70,7 @@ Sometimes, just an antibot is not enough... Here are ways to prevent bots from j
 
 - More Blocking Options (When new botting patterns are found).
 - Prevent answers during team talk
+- Ensuring banned bots are removed from the UI
 
 ## Support for other play.kahoot.it scripts
 
diff --git a/dist/kahoot-antibot.user.js b/dist/kahoot-antibot.user.js
@@ -3,7 +3,7 @@
 // @name:ja        Kーアンチボット
 // @namespace      http://tampermonkey.net/
 // @homepage       https://theusaf.org
-// @version        4.2.1
+// @version        4.2.2
 // @icon           https://cdn.discordapp.com/icons/641133408205930506/31c023710d468520708d6defb32a89bc.png
 // @description    Remove all bots from a kahoot game.
 // @description:es eliminar todos los bots de un Kahoot! juego.
@@ -40,6 +40,25 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
  * for helping with contribution and testing of this project
  */
 const KANTIBOT_VERSION = GM_info.script.version, kantibotData = {
+    settingsTypes: {
+        timeout: "boolean",
+        looksRandom: "boolean",
+        blockformat1: "boolean",
+        blockservice1: "boolean",
+        blocknum: "boolean",
+        forceascii: "boolean",
+        patterns: "boolean",
+        teamtimeout: "number",
+        twoFactorTime: "number",
+        percent: "number",
+        wordblock: "string",
+        ddos: "number",
+        start_lock: "number",
+        counters: "boolean",
+        counterCheats: "boolean",
+        enableCAPTCHA: "boolean",
+        reduceFalsePositives: "boolean",
+    },
     settings: {
         timeout: false,
         looksRandom: true,
@@ -510,10 +529,8 @@ const METHODS = {
         return kantibotData.settings[id];
     },
     setSetting(id, value) {
-        const localConfig = JSON.parse(window.localStorage.antibotConfig ?? "{}");
-        localConfig[id] = value;
-        window.localStorage.antibotConfig = JSON.stringify(localConfig);
         kantibotData.settings[id] = value; // as any to avoid weird typescript issue
+        window.localStorage.kantibotConfig = JSON.stringify(kantibotData.settings);
     },
     applyCaptchaQuestion(question) {
         const answers = ["red", "blue", "yellow", "green"], images = [
@@ -1138,8 +1155,22 @@ const localConfig = JSON.parse(window.localStorage.kantibotConfig ??
     "{}");
 for (const setting in localConfig) {
     try {
+        const settingType = kantibotData.settingsTypes[setting];
         const current = METHODS.getSetting(setting);
-        METHODS.setSetting(setting, localConfig[setting] ?? current);
+        let value = localConfig[setting] ?? current;
+        if (value)
+            switch (settingType) {
+                case "boolean":
+                    value = !!value;
+                    break;
+                case "number":
+                    value = +value;
+                    break;
+                case "string":
+                    value = `${value}`;
+                    break;
+            }
+        METHODS.setSetting(setting, value);
     }
     catch {
         /* ignored */
@@ -1480,11 +1511,25 @@ const KANTIBOT_HOOKS = {
                 if (!socket.webSocket.oldSend) {
                     socket.webSocket.oldSend = socket.webSocket.send;
                     socket.webSocket.send = function (data) {
-                        websocketMessageSendHandler(socket, data);
+                        try {
+                            websocketMessageSendHandler(socket, data);
+                        }
+                        catch (err) {
+                            log("Error in websocketMessageSendHandler");
+                            console.error(err);
+                        }
                         socket.webSocket.oldSend(data);
                     };
                 }
-                if (websocketMessageReceiveVerification(socket, message) === !BOT_DETECTED) {
+                let verificationResult = !BOT_DETECTED;
+                try {
+                    verificationResult = websocketMessageReceiveVerification(socket, message);
+                }
+                catch (err) {
+                    log("Error in websocketMessageReceiveVerification");
+                    console.error(err);
+                }
+                if (verificationResult === !BOT_DETECTED) {
                     return value.call(this, socket, message);
                 }
             };
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -146,6 +146,7 @@ declare global {
   }
 
   interface KAntibotData {
+    settingsTypes: Record<keyof KAntibotSettings, string>;
     settings: KAntibotSettings;
     methods: Record<string, CallableFunction>;
     runtimeData: {
diff --git a/src/kahoot-antibot.user.ts b/src/kahoot-antibot.user.ts
@@ -3,7 +3,7 @@
 // @name:ja        Kーアンチボット
 // @namespace      http://tampermonkey.net/
 // @homepage       https://theusaf.org
-// @version        4.2.1
+// @version        4.2.2
 // @icon           https://cdn.discordapp.com/icons/641133408205930506/31c023710d468520708d6defb32a89bc.png
 // @description    Remove all bots from a kahoot game.
 // @description:es eliminar todos los bots de un Kahoot! juego.
@@ -45,6 +45,25 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 const KANTIBOT_VERSION = GM_info.script.version,
   kantibotData: KAntibotData = {
+    settingsTypes: {
+      timeout: "boolean",
+      looksRandom: "boolean",
+      blockformat1: "boolean",
+      blockservice1: "boolean",
+      blocknum: "boolean",
+      forceascii: "boolean",
+      patterns: "boolean",
+      teamtimeout: "number",
+      twoFactorTime: "number",
+      percent: "number",
+      wordblock: "string",
+      ddos: "number",
+      start_lock: "number",
+      counters: "boolean",
+      counterCheats: "boolean",
+      enableCAPTCHA: "boolean",
+      reduceFalsePositives: "boolean",
+    },
     settings: {
       timeout: false,
       looksRandom: true,
@@ -550,10 +569,8 @@ const METHODS = {
     id: keyof KAntibotSettings,
     value: T
   ) {
-    const localConfig = JSON.parse(window.localStorage.antibotConfig ?? "{}");
-    localConfig[id] = value;
-    window.localStorage.antibotConfig = JSON.stringify(localConfig);
     (kantibotData.settings as unknown as Record<string, unknown>)[id] = value; // as any to avoid weird typescript issue
+    window.localStorage.kantibotConfig = JSON.stringify(kantibotData.settings);
   },
 
   applyCaptchaQuestion(question: KQuestion): void {
@@ -1343,11 +1360,23 @@ const localConfig: Record<keyof KAntibotSettings, string | boolean | number> =
   );
 for (const setting in localConfig) {
   try {
+    const settingType =
+      kantibotData.settingsTypes[setting as keyof KAntibotSettings];
     const current = METHODS.getSetting(setting as keyof KAntibotSettings);
-    METHODS.setSetting(
-      setting as keyof KAntibotSettings,
-      localConfig[setting as keyof KAntibotSettings] ?? current
-    );
+    let value = localConfig[setting as keyof KAntibotSettings] ?? current;
+    if (value)
+      switch (settingType) {
+        case "boolean":
+          value = !!value;
+          break;
+        case "number":
+          value = +value;
+          break;
+        case "string":
+          value = `${value}`;
+          break;
+      }
+    METHODS.setSetting(setting as keyof KAntibotSettings, value);
   } catch {
     /* ignored */
   }
@@ -1788,13 +1817,26 @@ const KANTIBOT_HOOKS: Record<string, KAntibotHook> = {
         if (!socket.webSocket.oldSend) {
           socket.webSocket.oldSend = socket.webSocket.send;
           socket.webSocket.send = function (data: string) {
-            websocketMessageSendHandler(socket, data);
+            try {
+              websocketMessageSendHandler(socket, data);
+            } catch (err) {
+              log("Error in websocketMessageSendHandler");
+              console.error(err);
+            }
             socket.webSocket.oldSend!(data);
           };
         }
-        if (
-          websocketMessageReceiveVerification(socket, message) === !BOT_DETECTED
-        ) {
+        let verificationResult = !BOT_DETECTED;
+        try {
+          verificationResult = websocketMessageReceiveVerification(
+            socket,
+            message
+          );
+        } catch (err) {
+          log("Error in websocketMessageReceiveVerification");
+          console.error(err);
+        }
+        if (verificationResult === !BOT_DETECTED) {
           return value.call(this, socket, message);
         }
       };

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ declare global {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`interface KAntibotData {`
	`149`	`+ settingsTypes: Record<keyof KAntibotSettings, string>;`
`149`	`150`	`settings: KAntibotSettings;`
`150`	`151`	`methods: Record<string, CallableFunction>;`
`151`	`152`	`runtimeData: {`