waitForMount->Go & fix bug where it checked wrong location on Catalina (

#20422)

* waitForMount->Go & fix bug where it checked wrong location on Catalina

* check for preferred mounts as well; and other feedback from strib

* there's nothing we can do about the timeout erorr so just ignore

* review feedback strib

go/service/kbfs_mount.go

@@ -4,6 +4,10 @@
 package service
 
 import (
+	"os"
+	"path/filepath"
+	"time"
+
 	"golang.org/x/net/context"
 
 	"github.com/keybase/client/go/libkb"
@@ -27,6 +31,43 @@ func (h *KBFSMountHandler) GetCurrentMountDir(ctx context.Context) (res string,
 	return h.G().Env.GetMountDir()
 }
 
+const waitForDirectMountTimeout = 10 * time.Second
+const waitForDirectMountPollInterval = time.Second
+
+func (h *KBFSMountHandler) WaitForMounts(ctx context.Context) (active bool, err error) {
+	ctx, cancel := context.WithTimeout(ctx, waitForDirectMountTimeout)
+	defer cancel()
+	mount, err := h.GetCurrentMountDir(ctx)
+	if err != nil {
+		return false, err
+	}
+	directMountFileToCheck := filepath.Join(mount, ".kbfs_error")
+	ticker := time.NewTicker(waitForDirectMountPollInterval)
+	defer ticker.Stop()
+	directMountFound, preferredMountFound := false, false
+	for !directMountFound || !preferredMountFound {
+		select {
+		case <-ticker.C:
+			if !directMountFound {
+				fi, err := os.Stat(directMountFileToCheck)
+				if err == nil && !fi.IsDir() {
+					directMountFound = true
+				}
+				// Not check os.IsNotExist here because it can be permission
+				// error too. So just wait it out.
+			}
+			if !preferredMountFound {
+				if len(libkb.FindPreferredKBFSMountDirs()) > 0 {
+					preferredMountFound = true
+				}
+			}
+		case <-ctx.Done():
+			return false, nil
+		}
+	}
+	return true, nil
+}
+
 func (h *KBFSMountHandler) GetPreferredMountDirs(ctx context.Context) (res []string, err error) {
 	res = libkb.FindPreferredKBFSMountDirs()
 	directMount, err := h.G().Env.GetMountDir()

protocol/avdl/keybase1/kbfsmount.avdl

@@ -4,6 +4,8 @@ protocol kbfsMount {
     @lint("ignore")
     string GetCurrentMountDir();
     @lint("ignore")
+    boolean WaitForMounts();
+    @lint("ignore")
     array<string> GetPreferredMountDirs();
     @lint("ignore")
     array<string> GetAllAvailableMountDirs();

protocol/bin/enabled-calls.json

@@ -185,6 +185,7 @@
   "keybase.1.install.installKBFS": {"promise": true},
   "keybase.1.install.uninstallKBFS": {"promise": true},
   "keybase.1.kbfsMount.GetCurrentMountDir": {"promise": true},
+  "keybase.1.kbfsMount.WaitForMounts": {"promise": true},
   "keybase.1.kbfsMount.GetPreferredMountDirs": {"promise": true},
   "keybase.1.kbfsMount.GetKBFSPathInfo": {"promise": true},
   "keybase.1.login.accountDelete": {"promise": true},

shared/actions/fs/platform-specific.desktop.tsx

@@ -2,7 +2,6 @@ import * as I from 'immutable'
 import * as ConfigGen from '../config-gen'
 import * as FsGen from '../fs-gen'
 import * as Saga from '../../util/saga'
-import * as Config from '../../constants/config'
 import * as RPCTypes from '../../constants/types/rpc-gen'
 import * as Types from '../../constants/types/fs'
 import * as Constants from '../../constants/fs'
@@ -145,24 +144,6 @@ const openPathInSystemFileManager = (state: TypedState, action: FsGen.OpenPathIn
         }
       }) as Promise<void>)
 
-function waitForMount(attempt: number) {
-  return new Promise((resolve, reject) => {
-    // Read the KBFS path waiting for files to exist, which means it's mounted
-    // TODO: should handle current mount directory
-    fs.readdir(`${Config.defaultKBFSPath}${Config.defaultPrivatePrefix}`, (err, files) => {
-      if (!err && files.length > 0) {
-        resolve(true)
-      } else if (attempt > 15) {
-        reject(new Error(`${Config.defaultKBFSPath} is unavailable. Please try again.`))
-      } else {
-        setTimeout(() => {
-          waitForMount(attempt + 1).then(resolve, reject)
-        }, 1000)
-      }
-    })
-  })
-}
-
 const fuseStatusToUninstallExecPath = isWindows
   ? (status: RPCTypes.FuseStatus) => {
       const field =
@@ -257,7 +238,7 @@ const driverEnableFuse = async (_: TypedState, action: FsGen.DriverEnablePayload
     ]
   } else {
     await RPCTypes.installInstallKBFSRpcPromise() // restarts kbfsfuse
-    await waitForMount(0)
+    await RPCTypes.kbfsMountWaitForMountsRpcPromise()
     return FsGen.createRefreshDriverStatus()
   }
 }

shared/fs/banner/system-file-manager-integration-banner/index.tsx

@@ -183,7 +183,7 @@ const JustEnabled = ({onDismiss}: JustEnabledProps) => {
   const displayingMountDir = preferredMountDirs.get(0) || ''
   const dispatch = Container.useDispatch()
   const open = displayingMountDir
-    ? () => dispatch(FsGen.createOpenPathInSystemFileManager({path: displayingMountDir}))
+    ? () => dispatch(FsGen.createOpenLocalPathInSystemFileManager({localPath: displayingMountDir}))
     : undefined
   return (
     <Banner