Switched from grpc to @grpc/grpc-js.

This change is required to be able to support ARM arch
in the future.

 - Fixed the download links for armv7l Linux.
 - Checked in the generated code. [grpc/grpc-node#1497]
 - Made the code generation a manual step.
 - Made the `grpc-tools` dependency optional.
 - From now on, the serial port regex is case-insensitive.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

.github/workflows/build.yml

@@ -21,6 +21,7 @@ jobs:
           - os: windows-2016
           - os: ubuntu-latest
           - os: turin-macmini # self-hosted macOS
+          # - os: rsora-rpi-arm # self-hosted armhf
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 30
     steps:

.gitignore

@@ -13,7 +13,5 @@ src-gen/
 yarn*.log
 # For the VS Code extensions used by Theia.
 plugins
-# generated JS/TS for the gRPC API
-arduino-ide-extension/src/node/cli-protocol
 # the config files for the CLI
 arduino-ide-extension/data/cli/config

README.md

@@ -61,7 +61,6 @@ yarn
 ```sh
 yarn rebuild:electron
 ```
-Note: this step takes long. It completes in 4-5 minutes on a MacBook Pro, 2.9 GHz Quad-Core Intel Core i7.
 
 ### Start
 ```sh

arduino-ide-extension/package.json

@@ -7,7 +7,7 @@
     "node": ">=10.11.0 <12"
   },
   "scripts": {
-    "prepare": "yarn download-cli && yarn generate-protocol && yarn download-ls && yarn run clean && yarn run build",
+    "prepare": "yarn download-cli && yarn download-ls && yarn run clean && yarn run build",
     "clean": "rimraf lib",
     "download-cli": "node ./scripts/download-cli.js",
     "download-ls": "node ./scripts/download-ls.js",
@@ -19,6 +19,7 @@
     "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
+    "@grpc/grpc-js": "^1.1.1",
     "@theia/application-package": "next",
     "@theia/core": "next",
     "@theia/cpp": "next",
@@ -50,7 +51,6 @@
     "fuzzy": "^0.1.3",
     "glob": "^7.1.6",
     "google-protobuf": "^3.11.4",
-    "grpc": "^1.24.2",
     "lodash.debounce": "^4.0.8",
     "js-yaml": "^3.13.1",
     "p-queue": "^5.0.0",
@@ -73,18 +73,20 @@
     "decompress-targz": "^4.1.1",
     "decompress-unzip": "^4.0.1",
     "download": "^7.1.0",
-    "grpc-tools": "^1.8.0",
-    "grpc_tools_node_protoc_ts": "^2.5.8",
+    "grpc_tools_node_protoc_ts": "^4.1.0",
     "mocha": "^7.0.0",
     "moment": "^2.24.0",
     "ncp": "^2.0.0",
-    "protoc": "1.0.4",
+    "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
     "sinon": "^9.0.1",
     "temp": "^0.9.1",
     "uuid": "^3.2.1",
     "yargs": "^11.1.0"
   },
+  "optionalDependencies": {
+    "grpc-tools": "^1.9.0"
+  },
   "mocha": {
     "require": [
       "reflect-metadata/Reflect"

arduino-ide-extension/scripts/download-cli.js

@@ -42,6 +42,7 @@
             case 'win32': return 'Windows_64bit.zip';
             case 'linux': {
                 switch (arch) {
+                    case 'arm': return 'Linux_ARMv7.tar.gz';
                     case 'arm64': return 'Linux_ARM64.tar.gz';
                     case 'x64': return 'Linux_64bit.tar.gz';
                     default: return undefined;

arduino-ide-extension/scripts/generate-protocol.js

@@ -40,12 +40,6 @@
         shell.exit(1);
     }
 
-    const pluginExec = shell.which('grpc_tools_node_protoc_plugin');
-    if (!pluginExec || pluginExec.code !== 0) {
-        shell.exit(1);
-    }
-    const plugin = pluginExec.stdout.trim();
-
     const rpc = path.join(repository, 'rpc');
     const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
     shell.mkdir('-p', out);
@@ -67,8 +61,7 @@
     // Generate JS code from the `.proto` files.
     if (shell.exec(`grpc_tools_node_protoc \
 --js_out=import_style=commonjs,binary:${out} \
---grpc_out=${out} \
---plugin=protoc-gen-grpc=${plugin} \
+--grpc_out=generate_package_definition:${out} \
 -I ${rpc} \
 ${protos.join(' ')}`).code !== 0) {
         shell.exit(1);
@@ -77,7 +70,7 @@ ${protos.join(' ')}`).code !== 0) {
     // Generate the `.d.ts` files for JS.
     if (shell.exec(`protoc \
 --plugin=protoc-gen-ts=${path.resolve(__dirname, '..', 'node_modules', '.bin', `protoc-gen-ts${platform === 'win32' ? '.cmd' : ''}`)} \
---ts_out=${out} \
+--ts_out=generate_package_definition:${out} \
 -I ${rpc} \
 ${protos.join(' ')}`).code !== 0) {
         shell.exit(1);

arduino-ide-extension/src/common/protocol/boards-service.ts

@@ -142,7 +142,7 @@ export namespace Port {
         }
         if (isOSX) {
             // Example: `/dev/cu.usbmodem14401`
-            if (/(tty|cu)\..*/.test(address.substring('/dev/'.length))) {
+            if (/(tty|cu)\..*/i.test(address.substring('/dev/'.length))) {
                 return [
                     '/dev/cu.MALS',
                     '/dev/cu.SOC',
@@ -152,7 +152,7 @@ export namespace Port {
         }
 
         // Example: `/dev/ttyACM0`
-        if (/(ttyS|ttyUSB|ttyACM|ttyAMA|rfcomm|ttyO)[0-9]{1,3}/.test(address.substring('/dev/'.length))) {
+        if (/(ttyS|ttyUSB|ttyACM|ttyAMA|rfcomm|ttyO)[0-9]{1,3}/i.test(address.substring('/dev/'.length))) {
             // Default ports were `/dev/ttyS0` -> `/dev/ttyS31` on Ubuntu 16.04.2.
             if (address.startsWith('/dev/ttyS')) {
                 const index = Number.parseInt(address.substring('/dev/ttyS'.length), 10);

arduino-ide-extension/src/node/cli-protocol/commands/board_grpc_pb.js

@@ -0,0 +1 @@
+// GENERATED CODE -- NO SERVICES IN PROTO