Merge branch 'master' into tls-patch

Author: v0idpwn

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   check_format:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Check format
     steps:
       - uses: actions/checkout@v3
@@ -29,15 +29,13 @@ jobs:
       - name: Check format
         run: mix format --check-formatted
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     strategy:
       matrix:
         otp: [24.x, 25.x, 26.1.x]
         elixir: [1.15.x]
-        include:
-          - otp: 24.x
-            elixir: 1.12.x
+
     needs: check_format
     steps:
       - uses: actions/checkout@v3
@@ -56,7 +54,7 @@ jobs:
       - name: Run Tests
         run: mix test
   interop-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Interop tests
     needs: check_format
     if: ${{ github.ref != 'refs/heads/master' }}
@@ -80,17 +78,15 @@ jobs:
         working-directory: ./interop
 
   interop-tests-all:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Interop tests OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     needs: check_format
     if: ${{ github.ref == 'refs/heads/master' }}
     strategy:
       matrix:
         otp: [24.x, 25.x, 26.1.x]
         elixir: [1.15.x]
-        include:
-          - otp: 24.x
-            elixir: 1.12.x
+
     steps:
       - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
@@ -111,7 +107,7 @@ jobs:
         working-directory: ./interop
 
   check_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Check release
     needs: check_format
     steps:

README.md

@@ -15,6 +15,7 @@ An Elixir implementation of [gRPC](http://www.grpc.io/).
 - [Usage](#usage)
   - [Simple RPC](#simple-rpc)
   - [HTTP Transcoding](#http-transcoding)
+  - [CORS](#cors)
   - [Start Application](#start-application)
 - [Features](#features)
 - [Benchmark](#benchmark)
@@ -24,13 +25,13 @@ An Elixir implementation of [gRPC](http://www.grpc.io/).
 
 The package can be installed as:
 
-  ```elixir
-  def deps do
-    [
-      {:grpc, "~> 0.9"}
-    ]
-  end
-  ```
+```elixir
+def deps do
+  [
+    {:grpc, "~> 0.10"}
+  ]
+end
+```
 
 ## Usage
 
@@ -59,10 +60,10 @@ service Greeter {
 
 ```
 
-2. Then generate Elixir code from proto file as [protobuf-elixir](https://github.com/tony612/protobuf-elixir#usage) shows (especially the `gRPC Support` section) or using [protobuf_generate](https://hex.pm/packages/protobuf_generate) hex package. Example using `protobuf_generate` lib:
+2. Then generate Elixir code from proto file as [protobuf-elixir](https://github.com/elixir-protobuf/protobuf#usage):
 
 ```shell
-mix protobuf.generate --output-path=./lib --include-path=./priv/protos helloworld.proto
+protoc --elixir_out=plugins=grpc:./lib -I./priv/protos helloworld.proto
 ```
 
 In the following sections you will see how to implement gRPC server logic.
@@ -96,7 +97,7 @@ end
 
 We will use this module [in the gRPC server startup section](#start-application).
 
-**__Note:__** For other types of RPC call like streams see [here](interop/lib/interop/server.ex).
+**Note:** For other types of RPC call like streams see [here](interop/lib/interop/server.ex).
 
 ### **HTTP Transcoding**
 
@@ -152,6 +153,7 @@ mix protobuf.generate \
 ```
 
 3. Enable http_transcode option in your Server module
+
 ```elixir
 defmodule Helloworld.Greeter.Server do
   use GRPC.Server,
@@ -167,6 +169,23 @@ end
 
 See full application code in [helloworld_transcoding](examples/helloworld_transcoding) example.
 
+### **CORS**
+
+When accessing gRPC from a browser via HTTP transcoding or gRPC-Web, CORS headers may be required for the browser to allow access to the gRPC endpoint. Adding CORS headers can be done by using `GRPC.Server.Interceptors.CORS` as an interceptor in your `GRPC.Endpoint` module, configuring it as decribed in the module documentation:
+
+Example:
+
+```elixir
+# Define your endpoint
+defmodule Helloworld.Endpoint do
+  use GRPC.Endpoint
+
+  intercept GRPC.Server.Interceptors.Logger
+  intercept GRPC.Server.Interceptors.CORS, allow_origin: "mydomain.io"
+  run Helloworld.Greeter.Server
+end
+```
+
 ### **Start Application**
 
 1. Start gRPC Server in your supervisor tree or Application module:
@@ -231,7 +250,7 @@ The accepted options for configuration are the ones listed on [Mint.HTTP.connect
 - [HTTP Transcoding](https://cloud.google.com/endpoints/docs/grpc/transcoding)
 - [TLS Authentication](https://grpc.io/docs/guides/auth/#supported-auth-mechanisms)
 - [Error handling](https://grpc.io/docs/guides/error/)
-- Interceptors (See [`GRPC.Endpoint`](https://github.com/elixir-grpc/grpc/blob/master/lib/grpc/endpoint.ex))
+- [Interceptors](`GRPC.Endpoint`)
 - [Connection Backoff](https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md)
 - Data compression
 - [gRPC Reflection](https://github.com/elixir-grpc/grpc-reflection)

benchmark/README.md

@@ -5,7 +5,7 @@ Benchmark implementation followed by [official spec](https://grpc.io/docs/guides
 ## Usage
 
 ```
-$ git clone https://github.com/tony612/grpc.git
+$ git clone https://github.com/elixir-grpc/grpc.git
 $ cd grpc && git checkout -t origin/elixir-bench
 $ git submodule update --init
 $ export ELIXIR_GRPC_PATH= # elixir-grpc path

benchmark/lib/grpc/core/stats.pb.ex

@@ -1,21 +1,24 @@
 defmodule Grpc.Core.Bucket do
   @moduledoc false
-  use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
+
+  use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
 
   field :start, 1, type: :double
   field :count, 2, type: :uint64
 end
 
 defmodule Grpc.Core.Histogram do
   @moduledoc false
-  use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
+
+  use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
 
   field :buckets, 1, repeated: true, type: Grpc.Core.Bucket
 end
 
 defmodule Grpc.Core.Metric do
   @moduledoc false
-  use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
+
+  use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
 
   oneof :value, 0
 
@@ -26,7 +29,8 @@ end
 
 defmodule Grpc.Core.Stats do
   @moduledoc false
-  use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
+
+  use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
 
   field :metrics, 1, repeated: true, type: Grpc.Core.Metric
-end
+end

benchmark/lib/grpc/testing/benchmark_service.pb.ex

@@ -1,19 +1 @@
-defmodule Grpc.Testing.BenchmarkService.Service do
-  @moduledoc false
-  use GRPC.Service, name: "grpc.testing.BenchmarkService", protoc_gen_elixir_version: "0.11.0"
 
-  rpc :UnaryCall, Grpc.Testing.SimpleRequest, Grpc.Testing.SimpleResponse
-
-  rpc :StreamingCall, stream(Grpc.Testing.SimpleRequest), stream(Grpc.Testing.SimpleResponse)
-
-  rpc :StreamingFromClient, stream(Grpc.Testing.SimpleRequest), Grpc.Testing.SimpleResponse
-
-  rpc :StreamingFromServer, Grpc.Testing.SimpleRequest, stream(Grpc.Testing.SimpleResponse)
-
-  rpc :StreamingBothWays, stream(Grpc.Testing.SimpleRequest), stream(Grpc.Testing.SimpleResponse)
-end
-
-defmodule Grpc.Testing.BenchmarkService.Stub do
-  @moduledoc false
-  use GRPC.Stub, service: Grpc.Testing.BenchmarkService.Service
-end