gitxelectron 1.2.0 → 1.2.1

package/out/main/index.js

@@ -825,12 +825,14 @@ async function getBranches(sessionId) {
         GIT_TERMINAL_PROMPT: "0",
         GIT_ASKPASS: "echo"
       });
-      if (remoteObj.refs.fetch) {
-        const authUrl = injectAuthToken(sessionId, remoteObj.refs.fetch);
-        await tempGit.fetch(authUrl, { "--prune": null });
-      } else {
-        await tempGit.fetch(remoteObj.name, { "--prune": null });
-      }
+      const FETCH_TIMEOUT_MS = 15e3;
+      const fetchPromise = remoteObj.refs.fetch ? tempGit.fetch(injectAuthToken(sessionId, remoteObj.refs.fetch), { "--prune": null }) : tempGit.fetch(remoteObj.name, { "--prune": null });
+      await Promise.race([
+        fetchPromise,
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error("Fetch timed out")), FETCH_TIMEOUT_MS)
+        )
+      ]);
     }
   } catch (e) {
   }

package/out/renderer/assets/{index-jk_ou_Zp.js → index-ChfAIvyi.js}

@@ -24613,6 +24613,7 @@ function App() {
   const [autoSyncLogs, setAutoSyncLogs] = reactExports.useState([]);
   const [showAutoSyncLogs, setShowAutoSyncLogs] = reactExports.useState(false);
   const [isRefreshing, setIsRefreshing] = reactExports.useState(false);
+  const refreshLockRef = reactExports.useRef(false);
   const [showWelcomeWizard, setShowWelcomeWizard] = reactExports.useState(false);
   const [newPin, setNewPin] = reactExports.useState("");
   const [pinChangeSuccess, setPinChangeSuccess] = reactExports.useState(false);
@@ -24777,7 +24778,7 @@ function App() {
     if (isRepo && repoPath) {
       interval = setInterval(() => {
         refreshRepoState();
-      }, 3e4);
+      }, 12e4);
     }
     return () => {
       if (interval) clearInterval(interval);
@@ -24943,6 +24944,8 @@ function App() {
     }
   };
   const refreshRepoState = async () => {
+    if (refreshLockRef.current) return;
+    refreshLockRef.current = true;
     setIsRefreshing(true);
     try {
       setErrorMsg("");
@@ -24956,28 +24959,6 @@ function App() {
         setDeletedHistory(dh);
       } catch (err) {
       }
-      try {
-        const b = await window.api.getBranches();
-        setBranches(b);
-        const updatedStatus = await window.api.getStatus();
-        setStatus(updatedStatus);
-        if (autoSyncEnabled && updatedStatus.behind > 0) {
-          const remotes2 = await window.api.getRemotes();
-          if (remotes2.length > 0) {
-            try {
-              showToast(`Auto-Push: Downloading ${updatedStatus.behind} remote change(s)...`, "info");
-              await window.api.pullFromRemote(remotes2[0].name, b.current);
-              showToast("Auto-Push: Successfully synchronized remote changes!", "success");
-              const finalStatus = await window.api.getStatus();
-              setStatus(finalStatus);
-            } catch (e) {
-              console.error("Auto-Push Pull failed:", e);
-            }
-          }
-        }
-      } catch (e) {
-        setBranches({ current: "No commits yet", all: [] });
-      }
       const auth = await window.api.getAuthStatus();
       setAuthStatus(auth);
       const accs = await window.api.getAccounts();
@@ -25009,32 +24990,58 @@ function App() {
       } else {
         setRemoteUrl(null);
       }
-      if (auth.status === "Verified") {
-        if (remotes.length > 0) {
-          const remoteUrl2 = remotes[0].refs.push;
-          const hasPerm = await window.api.verifyPushPermission(remoteUrl2);
-          setPushPermission(hasPerm);
-          try {
-            const invs = await window.api.getUserInvitations();
-            setInvitations(invs || []);
-          } catch (e) {
-            console.error("Failed to fetch invitations", e);
+      const deferredRemotes = remotes;
+      (async () => {
+        try {
+          const b = await window.api.getBranches();
+          setBranches(b);
+          const updatedStatus = await window.api.getStatus();
+          setStatus(updatedStatus);
+          if (autoSyncEnabled && updatedStatus.behind > 0) {
+            if (deferredRemotes.length > 0) {
+              try {
+                showToast(`Auto-Push: Downloading ${updatedStatus.behind} remote change(s)...`, "info");
+                await window.api.pullFromRemote(deferredRemotes[0].name, b.current);
+                showToast("Auto-Push: Successfully synchronized remote changes!", "success");
+                const finalStatus = await window.api.getStatus();
+                setStatus(finalStatus);
+              } catch (e) {
+                console.error("Auto-Push Pull failed:", e);
+              }
+            }
           }
-          try {
-            const collabData = await window.api.getCollaborators(remoteUrl2);
-            setRepoCollaborators(collabData.collaborators || []);
-            if (remoteUrl2 && repoPath) {
-              const cleaned = remoteUrl2.replace("https://github.com/", "").replace(/\.git$/, "");
-              saveMapping(cleaned, repoPath);
+        } catch (e) {
+          setBranches({ current: "No commits yet", all: [] });
+        }
+      })();
+      if (auth.status === "Verified") {
+        if (deferredRemotes.length > 0) {
+          const remoteUrl2 = deferredRemotes[0].refs.push;
+          (async () => {
+            try {
+              const hasPerm = await window.api.verifyPushPermission(remoteUrl2);
+              setPushPermission(hasPerm);
+            } catch (e) {
+              console.error("Failed to verify push permission", e);
             }
-            if (collabData.collaborators?.length > 1 || collabData.invitations?.length > 0) {
-              window.api.getCollaboratedRepos().then((repos) => setCollaboratedRepos(repos || [])).catch(() => {
-              });
+            try {
+              const invs = await window.api.getUserInvitations();
+              setInvitations(invs || []);
+            } catch (e) {
+              console.error("Failed to fetch invitations", e);
             }
-          } catch (e) {
-            console.error("Failed to fetch collaborators", e);
-            setRepoCollaborators([]);
-          }
+            try {
+              const collabData = await window.api.getCollaborators(remoteUrl2);
+              setRepoCollaborators(collabData.collaborators || []);
+              if (remoteUrl2 && repoPath) {
+                const cleaned = remoteUrl2.replace("https://github.com/", "").replace(/\.git$/, "");
+                saveMapping(cleaned, repoPath);
+              }
+            } catch (e) {
+              console.error("Failed to fetch collaborators", e);
+              setRepoCollaborators([]);
+            }
+          })();
         } else {
           setPushPermission(true);
         }
@@ -25072,6 +25079,7 @@ function App() {
       }
     } finally {
       setIsRefreshing(false);
+      refreshLockRef.current = false;
     }
   };
   const handleCreateBranchSubmit = async (name, base) => {

package/out/renderer/index.html

@@ -21,7 +21,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="./assets/index-jk_ou_Zp.js"></script>
+    <script type="module" crossorigin src="./assets/index-ChfAIvyi.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BAXzLIAI.css">
   </head>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitxelectron",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "An elegant, completely silent auto-syncing Git client. Works as a desktop app and npm CLI tool.",
   "main": "./out/main/index.js",
   "files": [