Skip to content

Commit ade802b

Browse files
committed
Refactor Init process to use new CLI gRPC API
1 parent cd0f1b3 commit ade802b

File tree

9 files changed

+974
-553
lines changed

9 files changed

+974
-553
lines changed

Diff for: arduino-ide-extension/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@
122122
],
123123
"arduino": {
124124
"cli": {
125-
"version": "0.18.2"
125+
"version": {
126+
"owner": "arduino",
127+
"repo": "arduino-cli",
128+
"commitish": "455f39e"
129+
}
126130
}
127131
}
128132
}

Diff for: arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb.d.ts

+18-17
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import * as grpc from "@grpc/grpc-js";
88
import {handleClientStreamingCall} from "@grpc/grpc-js/build/src/server-call";
99
import * as cc_arduino_cli_commands_v1_commands_pb from "../../../../../cc/arduino/cli/commands/v1/commands_pb";
10+
import * as google_rpc_status_pb from "../../../../../google/rpc/status_pb";
1011
import * as cc_arduino_cli_commands_v1_common_pb from "../../../../../cc/arduino/cli/commands/v1/common_pb";
1112
import * as cc_arduino_cli_commands_v1_board_pb from "../../../../../cc/arduino/cli/commands/v1/board_pb";
1213
import * as cc_arduino_cli_commands_v1_compile_pb from "../../../../../cc/arduino/cli/commands/v1/compile_pb";
@@ -15,9 +16,9 @@ import * as cc_arduino_cli_commands_v1_upload_pb from "../../../../../cc/arduino
1516
import * as cc_arduino_cli_commands_v1_lib_pb from "../../../../../cc/arduino/cli/commands/v1/lib_pb";
1617

1718
interface IArduinoCoreServiceService extends grpc.ServiceDefinition<grpc.UntypedServiceImplementation> {
19+
create: IArduinoCoreServiceService_ICreate;
1820
init: IArduinoCoreServiceService_IInit;
1921
destroy: IArduinoCoreServiceService_IDestroy;
20-
rescan: IArduinoCoreServiceService_IRescan;
2122
updateIndex: IArduinoCoreServiceService_IUpdateIndex;
2223
updateLibrariesIndex: IArduinoCoreServiceService_IUpdateLibrariesIndex;
2324
updateCoreLibrariesIndex: IArduinoCoreServiceService_IUpdateCoreLibrariesIndex;
@@ -54,6 +55,15 @@ interface IArduinoCoreServiceService extends grpc.ServiceDefinition<grpc.Untyped
5455
libraryList: IArduinoCoreServiceService_ILibraryList;
5556
}
5657

58+
interface IArduinoCoreServiceService_ICreate extends grpc.MethodDefinition<cc_arduino_cli_commands_v1_commands_pb.CreateRequest, cc_arduino_cli_commands_v1_commands_pb.CreateResponse> {
59+
path: "/cc.arduino.cli.commands.v1.ArduinoCoreService/Create";
60+
requestStream: false;
61+
responseStream: false;
62+
requestSerialize: grpc.serialize<cc_arduino_cli_commands_v1_commands_pb.CreateRequest>;
63+
requestDeserialize: grpc.deserialize<cc_arduino_cli_commands_v1_commands_pb.CreateRequest>;
64+
responseSerialize: grpc.serialize<cc_arduino_cli_commands_v1_commands_pb.CreateResponse>;
65+
responseDeserialize: grpc.deserialize<cc_arduino_cli_commands_v1_commands_pb.CreateResponse>;
66+
}
5767
interface IArduinoCoreServiceService_IInit extends grpc.MethodDefinition<cc_arduino_cli_commands_v1_commands_pb.InitRequest, cc_arduino_cli_commands_v1_commands_pb.InitResponse> {
5868
path: "/cc.arduino.cli.commands.v1.ArduinoCoreService/Init";
5969
requestStream: false;
@@ -72,15 +82,6 @@ interface IArduinoCoreServiceService_IDestroy extends grpc.MethodDefinition<cc_a
7282
responseSerialize: grpc.serialize<cc_arduino_cli_commands_v1_commands_pb.DestroyResponse>;
7383
responseDeserialize: grpc.deserialize<cc_arduino_cli_commands_v1_commands_pb.DestroyResponse>;
7484
}
75-
interface IArduinoCoreServiceService_IRescan extends grpc.MethodDefinition<cc_arduino_cli_commands_v1_commands_pb.RescanRequest, cc_arduino_cli_commands_v1_commands_pb.RescanResponse> {
76-
path: "/cc.arduino.cli.commands.v1.ArduinoCoreService/Rescan";
77-
requestStream: false;
78-
responseStream: false;
79-
requestSerialize: grpc.serialize<cc_arduino_cli_commands_v1_commands_pb.RescanRequest>;
80-
requestDeserialize: grpc.deserialize<cc_arduino_cli_commands_v1_commands_pb.RescanRequest>;
81-
responseSerialize: grpc.serialize<cc_arduino_cli_commands_v1_commands_pb.RescanResponse>;
82-
responseDeserialize: grpc.deserialize<cc_arduino_cli_commands_v1_commands_pb.RescanResponse>;
83-
}
8485
interface IArduinoCoreServiceService_IUpdateIndex extends grpc.MethodDefinition<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse> {
8586
path: "/cc.arduino.cli.commands.v1.ArduinoCoreService/UpdateIndex";
8687
requestStream: false;
@@ -391,9 +392,9 @@ interface IArduinoCoreServiceService_ILibraryList extends grpc.MethodDefinition<
391392
export const ArduinoCoreServiceService: IArduinoCoreServiceService;
392393

393394
export interface IArduinoCoreServiceServer {
395+
create: grpc.handleUnaryCall<cc_arduino_cli_commands_v1_commands_pb.CreateRequest, cc_arduino_cli_commands_v1_commands_pb.CreateResponse>;
394396
init: grpc.handleServerStreamingCall<cc_arduino_cli_commands_v1_commands_pb.InitRequest, cc_arduino_cli_commands_v1_commands_pb.InitResponse>;
395397
destroy: grpc.handleUnaryCall<cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, cc_arduino_cli_commands_v1_commands_pb.DestroyResponse>;
396-
rescan: grpc.handleUnaryCall<cc_arduino_cli_commands_v1_commands_pb.RescanRequest, cc_arduino_cli_commands_v1_commands_pb.RescanResponse>;
397398
updateIndex: grpc.handleServerStreamingCall<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse>;
398399
updateLibrariesIndex: grpc.handleServerStreamingCall<cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexRequest, cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexResponse>;
399400
updateCoreLibrariesIndex: grpc.handleServerStreamingCall<cc_arduino_cli_commands_v1_commands_pb.UpdateCoreLibrariesIndexRequest, cc_arduino_cli_commands_v1_commands_pb.UpdateCoreLibrariesIndexResponse>;
@@ -431,14 +432,14 @@ export interface IArduinoCoreServiceServer {
431432
}
432433

433434
export interface IArduinoCoreServiceClient {
435+
create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
436+
create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
437+
create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
434438
init(request: cc_arduino_cli_commands_v1_commands_pb.InitRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.InitResponse>;
435439
init(request: cc_arduino_cli_commands_v1_commands_pb.InitRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.InitResponse>;
436440
destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
437441
destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
438442
destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
439-
rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
440-
rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
441-
rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
442443
updateIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse>;
443444
updateIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse>;
444445
updateLibrariesIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexResponse>;
@@ -526,14 +527,14 @@ export interface IArduinoCoreServiceClient {
526527

527528
export class ArduinoCoreServiceClient extends grpc.Client implements IArduinoCoreServiceClient {
528529
constructor(address: string, credentials: grpc.ChannelCredentials, options?: Partial<grpc.ClientOptions>);
530+
public create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
531+
public create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
532+
public create(request: cc_arduino_cli_commands_v1_commands_pb.CreateRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.CreateResponse) => void): grpc.ClientUnaryCall;
529533
public init(request: cc_arduino_cli_commands_v1_commands_pb.InitRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.InitResponse>;
530534
public init(request: cc_arduino_cli_commands_v1_commands_pb.InitRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.InitResponse>;
531535
public destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
532536
public destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
533537
public destroy(request: cc_arduino_cli_commands_v1_commands_pb.DestroyRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.DestroyResponse) => void): grpc.ClientUnaryCall;
534-
public rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
535-
public rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
536-
public rescan(request: cc_arduino_cli_commands_v1_commands_pb.RescanRequest, metadata: grpc.Metadata, options: Partial<grpc.CallOptions>, callback: (error: grpc.ServiceError | null, response: cc_arduino_cli_commands_v1_commands_pb.RescanResponse) => void): grpc.ClientUnaryCall;
537538
public updateIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse>;
538539
public updateIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateIndexRequest, metadata?: grpc.Metadata, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateIndexResponse>;
539540
public updateLibrariesIndex(request: cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexRequest, options?: Partial<grpc.CallOptions>): grpc.ClientReadableStream<cc_arduino_cli_commands_v1_commands_pb.UpdateLibrariesIndexResponse>;

Diff for: arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb.js

+37-35
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//
1919
'use strict';
2020
var cc_arduino_cli_commands_v1_commands_pb = require('../../../../../cc/arduino/cli/commands/v1/commands_pb.js');
21+
var google_rpc_status_pb = require('../../../../../google/rpc/status_pb.js');
2122
var cc_arduino_cli_commands_v1_common_pb = require('../../../../../cc/arduino/cli/commands/v1/common_pb.js');
2223
var cc_arduino_cli_commands_v1_board_pb = require('../../../../../cc/arduino/cli/commands/v1/board_pb.js');
2324
var cc_arduino_cli_commands_v1_compile_pb = require('../../../../../cc/arduino/cli/commands/v1/compile_pb.js');
@@ -223,6 +224,28 @@ function deserialize_cc_arduino_cli_commands_v1_CompileResponse(buffer_arg) {
223224
return cc_arduino_cli_commands_v1_compile_pb.CompileResponse.deserializeBinary(new Uint8Array(buffer_arg));
224225
}
225226

227+
function serialize_cc_arduino_cli_commands_v1_CreateRequest(arg) {
228+
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.CreateRequest)) {
229+
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.CreateRequest');
230+
}
231+
return Buffer.from(arg.serializeBinary());
232+
}
233+
234+
function deserialize_cc_arduino_cli_commands_v1_CreateRequest(buffer_arg) {
235+
return cc_arduino_cli_commands_v1_commands_pb.CreateRequest.deserializeBinary(new Uint8Array(buffer_arg));
236+
}
237+
238+
function serialize_cc_arduino_cli_commands_v1_CreateResponse(arg) {
239+
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.CreateResponse)) {
240+
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.CreateResponse');
241+
}
242+
return Buffer.from(arg.serializeBinary());
243+
}
244+
245+
function deserialize_cc_arduino_cli_commands_v1_CreateResponse(buffer_arg) {
246+
return cc_arduino_cli_commands_v1_commands_pb.CreateResponse.deserializeBinary(new Uint8Array(buffer_arg));
247+
}
248+
226249
function serialize_cc_arduino_cli_commands_v1_DestroyRequest(arg) {
227250
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.DestroyRequest)) {
228251
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.DestroyRequest');
@@ -641,28 +664,6 @@ function deserialize_cc_arduino_cli_commands_v1_PlatformUpgradeResponse(buffer_a
641664
return cc_arduino_cli_commands_v1_core_pb.PlatformUpgradeResponse.deserializeBinary(new Uint8Array(buffer_arg));
642665
}
643666

644-
function serialize_cc_arduino_cli_commands_v1_RescanRequest(arg) {
645-
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.RescanRequest)) {
646-
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.RescanRequest');
647-
}
648-
return Buffer.from(arg.serializeBinary());
649-
}
650-
651-
function deserialize_cc_arduino_cli_commands_v1_RescanRequest(buffer_arg) {
652-
return cc_arduino_cli_commands_v1_commands_pb.RescanRequest.deserializeBinary(new Uint8Array(buffer_arg));
653-
}
654-
655-
function serialize_cc_arduino_cli_commands_v1_RescanResponse(arg) {
656-
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.RescanResponse)) {
657-
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.RescanResponse');
658-
}
659-
return Buffer.from(arg.serializeBinary());
660-
}
661-
662-
function deserialize_cc_arduino_cli_commands_v1_RescanResponse(buffer_arg) {
663-
return cc_arduino_cli_commands_v1_commands_pb.RescanResponse.deserializeBinary(new Uint8Array(buffer_arg));
664-
}
665-
666667
function serialize_cc_arduino_cli_commands_v1_UpdateCoreLibrariesIndexRequest(arg) {
667668
if (!(arg instanceof cc_arduino_cli_commands_v1_commands_pb.UpdateCoreLibrariesIndexRequest)) {
668669
throw new Error('Expected argument of type cc.arduino.cli.commands.v1.UpdateCoreLibrariesIndexRequest');
@@ -842,7 +843,20 @@ function deserialize_cc_arduino_cli_commands_v1_ZipLibraryInstallResponse(buffer
842843

843844
// The main Arduino Platform service API
844845
var ArduinoCoreServiceService = exports['cc.arduino.cli.commands.v1.ArduinoCoreService'] = {
845-
// Start a new instance of the Arduino Core Service
846+
// Create a new Arduino Core instance
847+
create: {
848+
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Create',
849+
requestStream: false,
850+
responseStream: false,
851+
requestType: cc_arduino_cli_commands_v1_commands_pb.CreateRequest,
852+
responseType: cc_arduino_cli_commands_v1_commands_pb.CreateResponse,
853+
requestSerialize: serialize_cc_arduino_cli_commands_v1_CreateRequest,
854+
requestDeserialize: deserialize_cc_arduino_cli_commands_v1_CreateRequest,
855+
responseSerialize: serialize_cc_arduino_cli_commands_v1_CreateResponse,
856+
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_CreateResponse,
857+
},
858+
// Initializes an existing Arduino Core instance by loading platforms and
859+
// libraries
846860
init: {
847861
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Init',
848862
requestStream: false,
@@ -866,18 +880,6 @@ destroy: {
866880
responseSerialize: serialize_cc_arduino_cli_commands_v1_DestroyResponse,
867881
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_DestroyResponse,
868882
},
869-
// Rescan instance of the Arduino Core Service
870-
rescan: {
871-
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/Rescan',
872-
requestStream: false,
873-
responseStream: false,
874-
requestType: cc_arduino_cli_commands_v1_commands_pb.RescanRequest,
875-
responseType: cc_arduino_cli_commands_v1_commands_pb.RescanResponse,
876-
requestSerialize: serialize_cc_arduino_cli_commands_v1_RescanRequest,
877-
requestDeserialize: deserialize_cc_arduino_cli_commands_v1_RescanRequest,
878-
responseSerialize: serialize_cc_arduino_cli_commands_v1_RescanResponse,
879-
responseDeserialize: deserialize_cc_arduino_cli_commands_v1_RescanResponse,
880-
},
881883
// Update package index of the Arduino Core Service
882884
updateIndex: {
883885
path: '/cc.arduino.cli.commands.v1.ArduinoCoreService/UpdateIndex',

0 commit comments

Comments
 (0)