small changes

Author: kodin

src/containers/AddThirdPartyServer/index.tsx

@@ -21,6 +21,7 @@ import {
   isValidDomain,
   validateServerAddressIPv4,
 } from "../../utils/validation";
+import { Log } from "../../utils/logger";
 
 const AddThirdPartyServerModal = () => {
   const { visible, showAddThirdPartyServer } = useAddThirdPartyServerModal();
@@ -31,11 +32,14 @@ const AddThirdPartyServerModal = () => {
 
   useEffect(() => {
     if (visible) {
-      clipboard.readText().then((text) => {
-        if (text) {
-          setServerAddress(text);
+      (async () => {
+        try {
+          const text = await clipboard.readText();
+          if (text) setServerAddress(text);
+        } catch (e) {
+          Log.error(e);
         }
-      });
+      })();
     }
   }, [visible]);
 

src/containers/ExternalServerHandler/index.tsx

@@ -33,10 +33,11 @@ const ExternalServerHandler = () => {
   const { addToFavorites } = usePersistentServers();
 
   useEffect(() => {
-    try {
-      (async () => {
+    (async () => {
+      try {
         const value = await invoke<string>("get_uri_scheme_value");
         if (
+          typeof value === "string" &&
           value.length &&
           (value.includes("omp://") || value.includes("samp://"))
         ) {
@@ -48,10 +49,10 @@ const ExternalServerHandler = () => {
           showModal(true);
           setServerAddress(serverAddress);
         }
-      })();
-    } catch (e) {
-      Log.error(e);
-    }
+      } catch (e) {
+        Log.error(e);
+      }
+    })();
 
     const unlisten = listen<string>("scheme-request-received", (event) => {
       if (typeof event.payload === "string") {
@@ -71,7 +72,7 @@ const ExternalServerHandler = () => {
     });
 
     return () => {
-      unlisten.then((f) => f());
+      unlisten.then((f) => f()).catch((e) => Log.error(e));
     };
   }, []);
 

src/containers/Settings/Tab/General.tsx

@@ -53,23 +53,19 @@ const General = () => {
   };
 
   const importFavListFromSAMP = async () => {
-    await invoke("get_samp_favorite_list").then((a) => {
-      const userData: {
-        file_id: string;
-        file_version: number;
-        server_count: number;
-        favorite_servers: {
-          ip: string;
-          port: number;
-          name: string;
-          password: string;
-          rcon: string;
-        }[];
-      } = JSON.parse(a as string);
+    try {
+      const a = await invoke("get_samp_favorite_list");
+      let userData: any = null;
+      try {
+        userData = JSON.parse(a as string);
+      } catch (err) {
+        Log.debug("Failed to parse samp favorite list:", err);
+        return;
+      }
 
-      if (userData.file_id === "SAMP") {
+      if (userData?.file_id === "SAMP") {
         const { addToFavorites } = usePersistentServers.getState();
-        userData.favorite_servers.forEach((server) => {
+        userData.favorite_servers?.forEach((server: any) => {
           const serverInfo: Server = {
             ip: "",
             port: 0,
@@ -88,24 +84,26 @@ const General = () => {
             rules: {} as Server["rules"],
           };
 
-          if (server.ip.length) {
+          if (server?.ip?.length) {
             serverInfo.ip = server.ip;
             serverInfo.port = server.port;
-            if (server.name.includes("(Retrieving info...)")) {
+            if (server.name?.includes("(Retrieving info...)")) {
               serverInfo.hostname += ` (${serverInfo.ip}:${serverInfo.port})`;
             } else {
               serverInfo.hostname = server.name;
             }
 
-            if (server.password.length) {
+            if (server.password?.length) {
               serverInfo.password = server.password;
             }
 
             addToFavorites(serverInfo);
           }
         });
       }
-    });
+    } catch (err) {
+      Log.debug(err);
+    }
   };
 
   return (

src/utils/game.ts

@@ -34,11 +34,12 @@ const getLocalPath = async (...segments: string[]) =>
 export const copySharedFilesIntoGameFolder = async () => {
   const { gtasaPath } = useSettings.getState();
   const shared = await getLocalPath("samp", "shared");
+  // invoke resolves on success and rejects on failure — don't turn a
+  // successful resolution into an exception. Await and let callers
+  // handle rejections via try/catch.
   await invoke("copy_files_to_gtasa", {
     src: shared,
     gtasaDir: gtasaPath,
-  }).then((e) => {
-    throw e;
   });
 };