Fix board list dialog not showing any port

silvanocerza · silvanocerza · commit 79cc20a89475 · 2021-05-11T10:04:05.000+02:00
diff --git a/arduino-ide-extension/src/node/board-discovery.ts b/arduino-ide-extension/src/node/board-discovery.ts
@@ -41,6 +41,7 @@ export class BoardDiscovery extends CoreClientAware {
 
     @postConstruct()
     protected async init(): Promise<void> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const req = new BoardListWatchRequest();
diff --git a/arduino-ide-extension/src/node/boards-service-impl.ts b/arduino-ide-extension/src/node/boards-service-impl.ts
@@ -49,6 +49,7 @@ export class BoardsServiceImpl extends CoreClientAware implements BoardsService
     }
 
     async getBoardDetails(options: { fqbn: string }): Promise<BoardDetails | undefined> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const { fqbn } = options;
@@ -152,6 +153,7 @@ export class BoardsServiceImpl extends CoreClientAware implements BoardsService
     }
 
     async searchBoards({ query }: { query?: string }): Promise<BoardWithPackage[]> {
+        await this.coreClientProvider.initialized;
         const { instance, client } = await this.coreClient();
         const req = new BoardSearchRequest();
         req.setSearchArgs(query || '');
@@ -181,6 +183,7 @@ export class BoardsServiceImpl extends CoreClientAware implements BoardsService
     }
 
     async search(options: { query?: string }): Promise<BoardsPackage[]> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -263,6 +266,7 @@ export class BoardsServiceImpl extends CoreClientAware implements BoardsService
     async install(options: { item: BoardsPackage, progressId?: string, version?: Installable.Version }): Promise<void> {
         const item = options.item;
         const version = !!options.version ? options.version : item.availableVersions[0];
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -294,6 +298,7 @@ export class BoardsServiceImpl extends CoreClientAware implements BoardsService
 
     async uninstall(options: { item: BoardsPackage, progressId?: string }): Promise<void> {
         const { item, progressId } = options;
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
diff --git a/arduino-ide-extension/src/node/core-client-provider.ts b/arduino-ide-extension/src/node/core-client-provider.ts
@@ -1,28 +1,36 @@
 import * as grpc from '@grpc/grpc-js';
 import { inject, injectable, postConstruct } from 'inversify';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { GrpcClientProvider } from './grpc-client-provider';
 import { ArduinoCoreServiceClient } from './cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb';
 import { Instance } from './cli-protocol/cc/arduino/cli/commands/v1/common_pb';
 import { CreateRequest, CreateResponse, InitRequest, InitResponse, UpdateIndexRequest, UpdateIndexResponse, UpdateLibrariesIndexRequest, UpdateLibrariesIndexResponse } from './cli-protocol/cc/arduino/cli/commands/v1/commands_pb';
 import * as commandsGrpcPb from './cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb';
 import { NotificationServiceServer } from '../common/protocol';
+import { Deferred } from '@theia/core/lib/common/promise-util';
 
 @injectable()
 export class CoreClientProvider extends GrpcClientProvider<CoreClientProvider.Client> {
 
     @inject(NotificationServiceServer)
     protected readonly notificationService: NotificationServiceServer;
 
-    protected readonly onClientReadyEmitter = new Emitter<void>();
+    protected _created = new Deferred<void>();
+    protected _initialized = new Deferred<void>();
 
-    get onClientReady(): Event<void> {
-        return this.onClientReadyEmitter.event;
+    get created(): Promise<void> {
+        return this._created.promise;
+    }
+
+    get initialized(): Promise<void> {
+        return this._initialized.promise
     }
 
     close(client: CoreClientProvider.Client): void {
         client.client.close();
+        this._created.reject();
+        this._initialized.reject();
+        this._created = new Deferred<void>();
+        this._initialized = new Deferred<void>();
     }
 
     @postConstruct()
@@ -33,13 +41,14 @@ export class CoreClientProvider extends GrpcClientProvider<CoreClientProvider.Cl
             // and notify client is ready.
             // TODO: Creation failure should probably be handled here
             await this.reconcileClient(cliConfig ? cliConfig.daemon.port : undefined)
-                .then(() => { this.onClientReadyEmitter.fire(); });
+                .then(() => { this._created.resolve() });
 
             // If client has been created correctly update indexes and initialize
             // its instance by loading platforms and cores.
             if (this._client && !(this._client instanceof Error)) {
                 await this.updateIndexes(this._client)
-                    .then(this.initInstance);
+                    .then(this.initInstance)
+                    .then(() => { this._initialized.resolve(); });
             }
         });
 
@@ -219,29 +228,13 @@ export abstract class CoreClientAware {
     protected readonly coreClientProvider: CoreClientProvider;
 
     protected async coreClient(): Promise<CoreClientProvider.Client> {
-        const coreClient = await new Promise<CoreClientProvider.Client>(async (resolve, reject) => {
-            const handle = (c: CoreClientProvider.Client | Error) => {
-                if (c instanceof Error) {
-                    reject(c);
-                } else {
-                    resolve(c);
-                }
+        return await new Promise<CoreClientProvider.Client>(async (resolve, reject) => {
+            const client = await this.coreClientProvider.client()
+            if (client && client instanceof Error) {
+                reject(client)
+            } else if (client) {
+                return resolve(client);
             }
-            const client = await this.coreClientProvider.client();
-            if (client) {
-                handle(client);
-                return;
-            }
-            const toDispose = new DisposableCollection();
-            toDispose.push(this.coreClientProvider.onClientReady(async () => {
-                const client = await this.coreClientProvider.client();
-                if (client) {
-                    handle(client);
-                }
-                toDispose.dispose();
-            }));
         });
-        return coreClient;
     }
-
 }
diff --git a/arduino-ide-extension/src/node/core-service-impl.ts b/arduino-ide-extension/src/node/core-service-impl.ts
@@ -26,6 +26,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
         const { sketchUri, fqbn, compilerWarnings } = options;
         const sketchPath = FileUri.fsPath(sketchUri);
 
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -85,6 +86,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
         const { sketchUri, fqbn, port, programmer } = options;
         const sketchPath = FileUri.fsPath(sketchUri);
 
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -121,6 +123,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     }
 
     async burnBootloader(options: CoreService.Bootloader.Options): Promise<void> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const { fqbn, port, programmer } = options;
diff --git a/arduino-ide-extension/src/node/library-service-server-impl.ts b/arduino-ide-extension/src/node/library-service-server-impl.ts
@@ -25,6 +25,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
     protected readonly notificationServer: NotificationServiceServer;
 
     async search(options: { query?: string }): Promise<LibraryPackage[]> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -68,6 +69,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
     }
 
     async list({ fqbn }: { fqbn?: string | undefined }): Promise<LibraryPackage[]> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const req = new LibraryListRequest();
@@ -143,6 +145,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
     }
 
     async listDependencies({ item, version, filterSelf }: { item: LibraryPackage, version: Installable.Version, filterSelf?: boolean }): Promise<LibraryDependency[]> {
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const req = new LibraryResolveDependenciesRequest();
@@ -168,6 +171,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
     async install(options: { item: LibraryPackage, progressId?: string, version?: Installable.Version, installDependencies?: boolean }): Promise<void> {
         const item = options.item;
         const version = !!options.version ? options.version : item.availableVersions[0];
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
@@ -198,6 +202,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
     }
 
     async installZip({ zipUri, progressId, overwrite }: { zipUri: string, progressId?: string, overwrite?: boolean }): Promise<void> {
+        await this.coreClientProvider.created;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
         const req = new ZipLibraryInstallRequest();
@@ -216,6 +221,7 @@ export class LibraryServiceImpl extends CoreClientAware implements LibraryServic
 
     async uninstall(options: { item: LibraryPackage, progressId?: string }): Promise<void> {
         const { item, progressId } = options;
+        await this.coreClientProvider.initialized;
         const coreClient = await this.coreClient();
         const { client, instance } = coreClient;
 
diff --git a/arduino-ide-extension/src/node/sketches-service-impl.ts b/arduino-ide-extension/src/node/sketches-service-impl.ts
@@ -107,6 +107,7 @@ export class SketchesServiceImpl extends CoreClientAware implements SketchesServ
     }
 
     async loadSketch(uri: string): Promise<SketchWithDetails> {
+        await this.coreClientProvider.initialized;
         const { client, instance } = await this.coreClient();
         const req = new LoadSketchRequest();
         req.setSketchPath(FileUri.fsPath(uri));
@@ -378,6 +379,7 @@ void loop() {
 
     async archive(sketch: Sketch, destinationUri: string): Promise<string> {
         await this.loadSketch(sketch.uri); // sanity check
+        await this.coreClientProvider.initialized;
         const { client } = await this.coreClient();
         const archivePath = FileUri.fsPath(destinationUri);
         // The CLI cannot override existing archives, so we have to wipe it manually: https://github.com/arduino/arduino-cli/issues/1160
