Add polling to desktop sidecar and fix infinite loop in findDataDirOwnershipHeld

Griffin Evans committed 4 months ago

Commit c91dcdb1 parent 9d996dc2 files · +46 −11Browse files

Unified · Split

2 files

apps/desktop/src/main/sidecar.ts +33 −6
apps/local/src/db/data-dir-ownership.ts +13 −5

 const STDERR_TAIL_LIMIT = 8 * 1024;
 const READY_SENTINEL = "EXECUTOR_READY";
 const ATTACHED_SENTINEL = "EXECUTOR_ATTACHED";
+const ATTACH_OWNER_TIMEOUT_MS = 15_000;
+const ATTACH_OWNER_POLL_MS = 150;
 // Children deliberately stopped via stopSidecar (quit, restart, update) —
 // their exits are expected and must not be reported as crashes.
     let stdoutControlBuffer = "";
     let resolved = false;
     let rejected = false;
+    let attachedOwnerResolution: Promise<boolean> | null = null;
     const logStdoutLine = makeLineSplitter((line) => sidecarLog.info(line));
     const logStderrLine = makeLineSplitter((line) => sidecarLog.error(line));
     const resolveAttachedOwner = async (): Promise<boolean> => {
       if (resolved || rejected) return true;
-      const attached = await attachToReachableLocalServer(dataDir);
+      if (!attachedOwnerResolution) {
-      if (!attached) return false;
+        attachedOwnerResolution = waitForReachableLocalServer(dataDir)
-      resolved = true;
+          .then((attached) => {
-      expectedExits.add(child);
+            if (resolved || rejected) return true;
-      resolveStart(attached);
+            if (!attached) return false;
-      return true;
+            resolved = true;
+            expectedExits.add(child);
+            resolveStart(attached);
+            return true;
+          })
+          .finally(() => {
+            attachedOwnerResolution = null;
+          });
+      }
+      return attachedOwnerResolution;
     };
     const onStdout = (chunk: Buffer) => {
   return false;
 };
+const waitForReachableLocalServer = async (
+  dataDir: string,
+  options: { readonly requireCliDaemon?: boolean } = {},
+): Promise<SidecarConnection | null> => {
+  const deadline = Date.now() + ATTACH_OWNER_TIMEOUT_MS;
+  while (Date.now() <= deadline) {
+    const attached = await attachToReachableLocalServer(dataDir, options);
+    if (attached) return attached;
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) return null;
+    await delay(Math.min(ATTACH_OWNER_POLL_MS, remaining));
+  }
+  return null;
+};
 const attachToReachableLocalServer = async (
   dataDir: string,
   options: { readonly requireCliDaemon?: boolean } = {},

apps/local/src/db/data-dir-ownership.ts+13−5

 };
 export const findDataDirOwnershipHeld = (cause: unknown): DataDirOwnershipHeld | null => {
-  if (cause instanceof DataDirOwnershipHeld) return cause;
+  const visited = new WeakSet<object>();
-  if (!isRecord(cause)) return null;
+  let current = cause;
-  const nestedCause = cause.cause;
+  while (true) {
-  if (nestedCause === undefined || nestedCause === cause) return null;
+    if (current instanceof DataDirOwnershipHeld) return current;
-  return findDataDirOwnershipHeld(nestedCause);
+    if (!isRecord(current)) return null;
+    if (visited.has(current)) return null;
+    visited.add(current);
+    const nestedCause = current.cause;
+    if (nestedCause === undefined) return null;
+    current = nestedCause;
+  }
 };
 export const acquireDataDirOwnership = async (dataDir: string): Promise<DataDirOwnership> => {