fix: bail when sketchbook dir is an existing file

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/dialogs/settings/settings.ts

@@ -27,6 +27,7 @@ import {
 import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
 import { DefaultTheme } from '@theia/application-package/lib/application-props';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import type { FileStat } from '@theia/filesystem/lib/common/files';
 
 export const WINDOW_SETTING = 'window';
 export const EDITOR_SETTING = 'editor';
@@ -231,7 +232,11 @@ export class SettingsService {
     try {
       const { sketchbookPath, editorFontSize, themeId } = await settings;
       const sketchbookDir = await this.fileSystemExt.getUri(sketchbookPath);
-      if (!(await this.fileService.exists(new URI(sketchbookDir)))) {
+      let sketchbookStat: FileStat | undefined = undefined;
+      try {
+        sketchbookStat = await this.fileService.resolve(new URI(sketchbookDir));
+      } catch {}
+      if (!sketchbookStat || !sketchbookStat.isDirectory) {
         return nls.localize(
           'arduino/preferences/invalid.sketchbook.location',
           'Invalid sketchbook location: {0}',

arduino-ide-extension/src/node/config-service-impl.ts

@@ -1,4 +1,4 @@
-import { promises as fs, constants } from 'fs';
+import { promises as fs } from 'fs';
 import { dirname } from 'path';
 import * as yaml from 'js-yaml';
 import * as grpc from '@grpc/grpc-js';
@@ -259,25 +259,23 @@ export class ConfigServiceImpl
   private async checkAccessible({
     directories,
   }: DefaultCliConfig): Promise<string[]> {
-    const accessible = (folderPath: string) =>
-      fs.access(folderPath, constants.R_OK | constants.W_OK);
-    const toConfigErrors = (
-      folderPath: string,
-      result: PromiseSettledResult<unknown>
-    ) =>
-      result.status === 'rejected'
-        ? [
-            nls.localize(
-              'arduino/configuration/cli/inaccessibleDirectory',
-              "Could not access the sketchbook location at '{0}': {1}",
-              folderPath,
-              String(result.reason)
-            ),
-          ]
-        : [];
-    const { user } = directories;
-    const [userAccessible] = await Promise.allSettled([accessible(user)]); // XXX: validate `directory.data` if required
-    return [...toConfigErrors(user, userAccessible)];
+    try {
+      await fs.readdir(directories.user);
+      return [];
+    } catch (err) {
+      console.error(
+        `Check accessible failed for input: ${directories.user}`,
+        err
+      );
+      return [
+        nls.localize(
+          'arduino/configuration/cli/inaccessibleDirectory',
+          "Could not access the sketchbook location at '{0}': {1}",
+          directories.user,
+          String(err)
+        ),
+      ];
+    }
   }
 
   private async updateDaemon(