wip

Author: giacomocusinato

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

@@ -585,7 +585,7 @@ function createBoardsPackage(
   if (!actualRelease) {
     return undefined;
   }
-  const { name, typeList, boardsList, deprecated, compatible } = actualRelease;
+  const { name, typesList, boardsList, deprecated, compatible } = actualRelease;
   if (!compatible) {
     return undefined; // never show incompatible platforms
   }
@@ -602,7 +602,7 @@ function createBoardsPackage(
     ),
     description: boardsList.map(({ name }) => name).join(', '),
     boards: boardsList,
-    types: typeList,
+    types: typesList,
     moreInfoLink: website,
     author: maintainer,
     deprecated,

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

@@ -21,11 +21,10 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { deepClone, nls } from '@theia/core';
 import { ErrnoException } from './utils/errors';
-import {
-  SettingsMergeRequest,
-  SettingsWriteRequest,
-} from './cli-protocol/cc/arduino/cli/commands/v1/settings_pb';
-import { createArduinoCoreServiceClient } from './arduino-core-service-client';
+// import {
+//   SettingsMergeRequest,
+//   SettingsWriteRequest,
+// } from './cli-protocol/cc/arduino/cli/commands/v1/settings_pb';
 
 const deepmerge = require('deepmerge');
 
@@ -73,6 +72,7 @@ export class ConfigServiceImpl
 
   // Used by frontend to update the config.
   async setConfiguration(config: Config): Promise<void> {
+    debugger;
     await this.ready.promise;
     if (Config.sameAs(this.config.config, config)) {
       return;
@@ -291,47 +291,49 @@ export class ConfigServiceImpl
   }
 
   private async updateDaemon(
-    port: number | number,
+    _: number | number,
     config: DefaultCliConfig
   ): Promise<void> {
-    const client = createArduinoCoreServiceClient({ port });
-    const req = new SettingsMergeRequest();
+    // const client = createArduinoCoreServiceClient({ port });
+    // const req = new SettingsMergeRequest();
     const json = JSON.stringify(config, null, 2);
-    req.setJsonData(json);
+    // req.setJsonData(json);
     this.logger.info(`Updating daemon with 'data': ${json}`);
     return new Promise<void>((resolve, reject) => {
-      client.settingsMerge(req, (error) => {
-        try {
-          if (error) {
-            reject(error);
-            return;
-          }
-          resolve();
-        } finally {
-          client.close();
-        }
-      });
+      reject('failed to update settings...');
+
+      // client.settingsMerge(req, (error) => {
+      //   try {
+      //     if (error) {
+      //       reject(error);
+      //       return;
+      //     }
+      //     resolve();
+      //   } finally {
+      //     client.close();
+      //   }
+      // });
     });
   }
 
-  private async writeDaemonState(port: number | number): Promise<void> {
-    const client = createArduinoCoreServiceClient({ port });
-    const req = new SettingsWriteRequest();
-    const cliConfigUri = await this.getCliConfigFileUri();
-    const cliConfigPath = FileUri.fsPath(cliConfigUri);
-    req.setFilePath(cliConfigPath);
+  private async writeDaemonState(_: number | number): Promise<void> {
+    // const client = createArduinoCoreServiceClient({ port });
+    // const req = new SettingsWriteRequest();
+    // const cliConfigUri = await this.getCliConfigFileUri();
+    // const cliConfigPath = FileUri.fsPath(cliConfigUri);
+    // req.setFilePath(cliConfigPath);
     return new Promise<void>((resolve, reject) => {
-      client.settingsWrite(req, (error) => {
-        try {
-          if (error) {
-            reject(error);
-            return;
-          }
-          resolve();
-        } finally {
-          client.close();
-        }
-      });
+      // client.settingsWrite(req, (error) => {
+      //   try {
+      //     if (error) {
+      //       reject(error);
+      //       return;
+      //     }
+      //     resolve();
+      //   } finally {
+      //     client.close();
+      //   }
+      // });
     });
   }
 

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

@@ -11,7 +11,6 @@ import type { Mutable } from '@theia/core/lib/common/types';
 import { FileUri } from '@theia/core/lib/node/file-uri';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import * as jspb from 'google-protobuf';
-import { BoolValue } from 'google-protobuf/google/protobuf/wrappers_pb';
 import path from 'node:path';
 import {
   UploadResponse as ApiUploadResponse,
@@ -195,9 +194,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     request.setVerbose(options.verbose);
     request.setQuiet(false);
     if (typeof options.exportBinaries === 'boolean') {
-      const exportBinaries = new BoolValue();
-      exportBinaries.setValue(options.exportBinaries);
-      request.setExportBinaries(exportBinaries);
+      request.setExportBinaries(options.exportBinaries);
     }
     this.mergeSourceOverrides(request, options);
     return request;