Merge branch 'master' into ts-type-improvements

.github/workflows/build.yml

@@ -495,7 +495,7 @@ jobs:
     name: Test Swift Linux
     strategy:
       matrix:
-        swift: ["6.0", "6.1", "6.2"]
+        swift: ["5.10", "6.1", "6.2"]
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v6
@@ -534,7 +534,7 @@ jobs:
          run: |
            swift sdk list
            swift build --build-tests --swift-sdk swift-6.2.1-RELEASE_wasm
-           wasmtime --dir . .build/wasm32-unknown-wasip1/debug/FlatBuffers.Test.Swift.WasmPackageTests.xctest --testing-library swift-testing
+           wasmtime --dir . .build/wasm32-unknown-wasip1/debug/FlatBuffers.Test.Swift.WasmPackageTests.xctest
 
   build-ts:
     name: Build TS
@@ -545,7 +545,7 @@ jobs:
       # FIXME: make test script not rely on flatc
       run: cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_INSTALL=OFF -DFLATBUFFERS_BUILD_FLATLIB=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF . && make -j
     - name: pnpm
-      run: npm install -g pnpm@10
+      run: npm install -g pnpm
     - name: deps
       run: pnpm i
     - name: compile

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:5.10
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *
@@ -36,17 +36,14 @@ let package = Package(
     .target(
       name: "FlatBuffers",
       dependencies: ["Common"],
-      path: "swift/Sources/FlatBuffers",
-      swiftSettings: .settings),
+      path: "swift/Sources/FlatBuffers"),
     .target(
       name: "FlexBuffers",
       dependencies: ["Common"],
-      path: "swift/Sources/FlexBuffers",
-      swiftSettings: .settings),
+      path: "swift/Sources/FlexBuffers"),
     .target(
       name: "Common",
-      path: "swift/Sources/Common",
-      swiftSettings: .settings),
+      path: "swift/Sources/Common"),
     .testTarget(
       name: "FlatbuffersTests",
       dependencies: .dependencies,
@@ -55,14 +52,7 @@ let package = Package(
       name: "FlexbuffersTests",
       dependencies: ["FlexBuffers"],
       path: "tests/swift/Tests/Flexbuffers"),
-  ],
-  swiftLanguageModes: [.v6])
-
-extension Array where Element == SwiftSetting {
-  static var settings: [SwiftSetting] {
-    [.enableUpcomingFeature("ExistentialAny")]
-  }
-}
+  ])
 
 extension Array where Element == Package.Dependency {
   static var dependencies: [Package.Dependency] {
@@ -70,12 +60,7 @@ extension Array where Element == Package.Dependency {
     []
     #else
     // Test only Dependency
-    [
-      .package(url: "https://github.com/grpc/grpc-swift-2.git", from: "2.0.0"),
-      .package(
-        url: "https://github.com/grpc/grpc-swift-nio-transport.git",
-        from: "2.0.0"),
-    ]
+    [.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1")]
     #endif
   }
 }
@@ -87,10 +72,7 @@ extension Array where Element == PackageDescription.Target.Dependency {
     #else
     // Test only Dependency
     [
-      .product(name: "GRPCCore", package: "grpc-swift-2"),
-      .product(
-        name: "GRPCNIOTransportHTTP2",
-        package: "grpc-swift-nio-transport"),
+      .product(name: "GRPC", package: "grpc-swift"),
       "FlatBuffers",
     ]
     #endif

benchmarks/swift/Benchmarks/FlatbuffersBenchmarks/FlatbuffersBenchmarks.swift

@@ -97,7 +97,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(ByteBuffer(assumingMemoryBound: memory, capacity: Int(oneGB)))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Clearing 1GB", configuration: singleConfiguration) { benchmark in
@@ -106,7 +105,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.clear())
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Strings 10") { benchmark in
@@ -115,7 +113,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.create(string: str10))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Strings 100") { benchmark in
@@ -124,7 +121,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.create(string: str100))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector 1 Bytes") { benchmark in
@@ -133,7 +129,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.createVector(bytes: bytes))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector 1 Ints") { benchmark in
@@ -142,7 +137,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.createVector(ints))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector 100 Ints") { benchmark in
@@ -151,7 +145,6 @@ let benchmarks = {
     for i in benchmark.scaledIterations {
       blackHole(fb.createVector(ints))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector 100 Bytes") { benchmark in
@@ -160,7 +153,6 @@ let benchmarks = {
     for i in benchmark.scaledIterations {
       blackHole(fb.createVector(bytes))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector 100 ContiguousBytes") { benchmark in
@@ -169,7 +161,6 @@ let benchmarks = {
     for i in benchmark.scaledIterations {
       blackHole(fb.createVector(bytes: bytes))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark(
@@ -187,7 +178,6 @@ let benchmarks = {
       fb.add(offset: off, at: 8)
       blackHole(fb.endTable(at: s))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark(
@@ -200,7 +190,6 @@ let benchmarks = {
       let s = fb.startTable(with: 4)
       blackHole(fb.endTable(at: s))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Struct") { benchmark in
@@ -209,7 +198,6 @@ let benchmarks = {
     for _ in benchmark.scaledIterations {
       blackHole(fb.create(struct: array.first!))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Structs") { benchmark in
@@ -231,7 +219,6 @@ let benchmarks = {
     fb.add(offset: vector, at: 4)
     let root = Offset(offset: fb.endTable(at: start))
     blackHole(fb.finish(offset: root))
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Vector of Offsets") { benchmark in
@@ -252,15 +239,12 @@ let benchmarks = {
       fb.add(offset: off, at: 2)
       blackHole(fb.endTable(at: s))
     }
-    benchmark.stopMeasurement()
   }
 
   Benchmark("Reading Doubles") { benchmark in
     let byteBuffer = ByteBuffer(data: data)
-    benchmark.startMeasurement()
     for _ in benchmark.scaledIterations {
       blackHole(byteBuffer.read(def: Double.self, position: 0))
     }
-    benchmark.stopMeasurement()
   }
 }

benchmarks/swift/Benchmarks/FlexBuffersBenchmarks/FlexBuffersBenchmarks.swift

@@ -1,174 +0,0 @@
-/*
- * Copyright 2024 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import Benchmark
-import FlexBuffers
-import Foundation
-
-let benchmarks = {
-  let data = {
-    var array = [8888.88, 8888.88]
-    var data = Data()
-    array.withUnsafeBytes { ptr in
-      data.append(contentsOf: ptr)
-    }
-    return data
-  }()
-  let ints: [Int32] = Array(repeating: 42, count: 100)
-  let str10 = (0...9).map { _ -> String in "x" }.joined()
-  let str100 = (0...99).map { _ -> String in "x" }.joined()
-
-  // A representative map: 50 keyed scalars, a keyed string and a keyed vector
-  // of 100 scalars. Used for the realistic decode benchmarks.
-  let mapBuffer: ByteBuffer = {
-    var fbx = FlexBuffersWriter(initialSize: 1 << 16)
-    fbx.map {
-      for i in 0..<50 { $0.add(int: i, key: "i\(i)") }
-      $0.add(string: "hello world", key: "s")
-      $0.vector(key: "v") { v in
-        for x in 0..<100 { v.add(int: x) }
-      }
-    }
-    fbx.finish()
-    return fbx.sizedByteBuffer
-  }()
-
-  let metrics: [BenchmarkMetric] = [
-    .cpuTotal,
-    .wallClock,
-    .mallocCountTotal,
-    .releaseCount,
-    .peakMemoryResident,
-  ]
-  let maxIterations = 1_000_000
-  let maxDuration: Duration = .seconds(3)
-  let megaConfiguration: Benchmark.Configuration = .init(
-    metrics: metrics,
-    warmupIterations: 1,
-    scalingFactor: .mega,
-    maxDuration: maxDuration,
-    maxIterations: maxIterations)
-
-  Benchmark.defaultConfiguration = megaConfiguration
-
-  // Decode (read path)
-
-  // Raw scalar read: isolates `read<T: BitwiseCopyable>` and the `let` blob.
-  Benchmark("Reading Doubles") { benchmark in
-    let byteBuffer = ByteBuffer(data: data)
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      blackHole(byteBuffer.read(def: Double.self, position: 0))
-    }
-    benchmark.stopMeasurement()
-  }
-
-  // Realistic decode: resolve root map and read a keyed scalar.
-  Benchmark("Decode Map Scalar") { benchmark in
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      let map = try! getRoot(buffer: mapBuffer)!.map!
-      blackHole(map["i25"]?.int)
-    }
-    benchmark.stopMeasurement()
-  }
-
-  // Realistic decode: resolve root map and read a keyed string.
-  Benchmark("Decode Map String") { benchmark in
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      let map = try! getRoot(buffer: mapBuffer)!.map!
-      blackHole(map["s"]?.string())
-    }
-    benchmark.stopMeasurement()
-  }
-
-  // Realistic decode: resolve a nested vector and sum its scalars.
-  Benchmark("Decode Vector") { benchmark in
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      let map = try! getRoot(buffer: mapBuffer)!.map!
-      let vector = map["v"]!.vector!
-      var sum: Int64 = 0
-      for i in 0..<vector.count {
-        sum &+= vector[i]?.int ?? 0
-      }
-      blackHole(sum)
-    }
-    benchmark.stopMeasurement()
-  }
-
-  // Encode (write path)
-  // Writers are reused with `reset(keepingCapacity:)` so per-iteration
-  // allocation does not dominate and mask the write-path cost (which is what
-  // the `@exclusivity(unchecked)` storage pointer affects).
-
-  Benchmark("Strings 10") { benchmark in
-    var fbx = FlexBuffersWriter(initialSize: 1 << 20)
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      fbx.add(string: str10)
-      fbx.finish()
-      blackHole(fbx.sizedByteBuffer)
-      fbx.reset(keepingCapacity: true)
-    }
-    benchmark.stopMeasurement()
-  }
-
-  Benchmark("Strings 100") { benchmark in
-    var fbx = FlexBuffersWriter(initialSize: 1 << 20)
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      fbx.add(string: str100)
-      fbx.finish()
-      blackHole(fbx.sizedByteBuffer)
-      fbx.reset(keepingCapacity: true)
-    }
-    benchmark.stopMeasurement()
-  }
-
-  Benchmark("Encoding Vector Of Ints") { benchmark in
-    var fbx = FlexBuffersWriter(initialSize: 1 << 20)
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      fbx.vector {
-        $0.create(vector: ints)
-      }
-      fbx.finish()
-      blackHole(fbx.sizedByteBuffer)
-      fbx.reset(keepingCapacity: true)
-    }
-    benchmark.stopMeasurement()
-  }
-
-  Benchmark("Encoding Map") { benchmark in
-    var fbx = FlexBuffersWriter(initialSize: 1 << 20)
-    benchmark.startMeasurement()
-    for _ in benchmark.scaledIterations {
-      fbx.map {
-        for i in 0..<50 { $0.add(int: i, key: "i\(i)") }
-        $0.add(string: "hello world", key: "s")
-        $0.vector(key: "v") { v in
-          for x in 0..<100 { v.add(int: x) }
-        }
-      }
-      fbx.finish()
-      blackHole(fbx.sizedByteBuffer)
-      fbx.reset(keepingCapacity: true)
-    }
-    benchmark.stopMeasurement()
-  }
-}

benchmarks/swift/Package.swift

@@ -39,14 +39,4 @@ let package = Package(
       plugins: [
         .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
       ]),
-    .executableTarget(
-      name: "FlexBuffersBenchmarks",
-      dependencies: [
-        .product(name: "FlexBuffers", package: "flatbuffers"),
-        .product(name: "Benchmark", package: "package-benchmark"),
-      ],
-      path: "Benchmarks/FlexBuffersBenchmarks",
-      plugins: [
-        .plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
-      ]),
   ])

grpc/examples/greeter_v2.fbs

@@ -1,16 +0,0 @@
-namespace models;
-
-table HelloResponse {
-  message:string;
-}
-
-table HelloRequest {
-  name:string;
-}
-
-rpc_service Greeter {
-  Get(HelloRequest):HelloResponse;
-  Collect(HelloRequest):HelloResponse (streaming: "client");
-  Expand(HelloRequest):HelloResponse (streaming: "server");
-  Update(HelloRequest):HelloResponse (streaming: "bidi");
-}

grpc/examples/swift/Greeter/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:5.10
 /*
  * Copyright 2020 Google Inc. All rights reserved.
  *
@@ -20,43 +20,39 @@ import PackageDescription
 let package = Package(
   name: "Greeter",
   platforms: [
-    .iOS(.v18),
-    .macOS(.v15),
+    .iOS(.v12),
+    .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../.."),
-    .package(url: "https://github.com/grpc/grpc-swift-2.git", from: "2.0.0"),
-    .package(
-      url: "https://github.com/grpc/grpc-swift-nio-transport.git",
-      from: "2.0.0"),
-    .package(
-      url: "https://github.com/apple/swift-argument-parser.git",
-      from: "1.5.0"),
+    .package(path: "../../../../swift"),
+    .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"),
   ],
   targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
     // Targets can depend on other targets in this package, and on products in packages which this package depends on.
     .target(
-      name: "Models",
+      name: "Model",
       dependencies: [
-        .product(name: "FlatBuffers", package: "flatbuffers"),
-        .product(name: "GRPCCore", package: "grpc-swift-2"),
-        .product(
-          name: "GRPCNIOTransportHTTP2",
-          package: "grpc-swift-nio-transport"),
-      ]),
+        "GRPC",
+        "FlatBuffers",
+      ],
+      path: "Sources/Model"),
 
     // Client for the Greeter example
-    .executableTarget(
-      name: "Commands",
+    .target(
+      name: "Client",
       dependencies: [
-        .product(name: "GRPCCore", package: "grpc-swift-2"),
-        .product(
-          name: "GRPCNIOTransportHTTP2",
-          package: "grpc-swift-nio-transport"),
-        .product(
-          name: "ArgumentParser",
-          package: "swift-argument-parser"),
-        "Models",
-      ]),
+        "GRPC",
+        "Model",
+      ],
+      path: "Sources/client"),
+
+    // Server for the Greeter example
+    .target(
+      name: "Server",
+      dependencies: [
+        "GRPC",
+        "Model",
+      ],
+      path: "Sources/server"),
   ])

grpc/examples/swift/Greeter/Sources/Commands/Commands.swift

@@ -1,28 +0,0 @@
-/*
- * Copyright 2024 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ArgumentParser
-
-let port = 3000
-
-@main
-struct GreeterCommand: AsyncParsableCommand {
-  static let configuration = CommandConfiguration(
-    commandName: "greeter",
-    abstract: "A multi-tool to run an echo server and execute RPCs against it.",
-    subcommands: [ServerCommand.self, ClientCommand.self])
-}
-

grpc/examples/swift/Greeter/Sources/Commands/Services/GreeterService.swift

@@ -1,121 +0,0 @@
-/*
- * Copyright 2024 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import FlatBuffers
-import GRPCCore
-import Models
-
-struct GreeterService: models_Greeter.SimpleServiceProtocol {
-  func Get(
-    request: GRPCMessage<models_HelloResponse>,
-    context: GRPCCore
-      .ServerContext) async throws -> GRPCMessage<models_HelloResponse>
-  {
-    let model = try request.decode()
-    print("## GreeterService.Get: \(model.message)")
-
-    var builder = FlatBufferBuilder(initialSize: 128)
-    let off = builder.create(string: "Hello \(model.message ?? "Unknown")")
-    let root = models_HelloResponse.createHelloResponse(
-      &builder,
-      messageOffset: off)
-    builder.finish(offset: root)
-    return try GRPCMessage<models_HelloResponse>(builder: &builder)
-  }
-
-  func Collect(
-    request: GRPCCore.RPCAsyncSequence<
-      GRPCMessage<models_HelloResponse>,
-      any Swift.Error
-    >,
-    context: GRPCCore
-      .ServerContext) async throws -> GRPCMessage<models_HelloResponse>
-  {
-    let messages: [String] = try await request
-      .reduce(into: []) { array, message in
-        let model = try message.decode()
-        return array.append(model.message ?? "Unknown")
-      }
-
-    let joined = messages.joined(separator: ", ")
-    print("## GreeterService.Collect: \(joined)")
-
-    var builder = FlatBufferBuilder(initialSize: 128)
-    let off = builder.create(string: "Hello \(joined)")
-    let root = models_HelloResponse.createHelloResponse(
-      &builder,
-      messageOffset: off)
-    builder.finish(offset: root)
-    return try GRPCMessage<models_HelloResponse>(builder: &builder)
-  }
-
-  func Expand(
-    request: GRPCMessage<models_HelloResponse>,
-    response: GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext) async throws
-  {
-
-    let model = try request.decode()
-    print("## GreeterService.Expand: \(model.message)")
-
-    let message = model.message ?? "Unknown"
-    let stream = AsyncThrowingStream<
-      GRPCMessage<models_HelloResponse>,
-      Error
-    > { continuation in
-      var builder = FlatBufferBuilder(initialSize: 128)
-      for char in message {
-        let off = builder.create(string: "\(char)")
-        let root = models_HelloResponse.createHelloResponse(
-          &builder,
-          messageOffset: off)
-        builder.finish(offset: root)
-
-        do {
-          continuation
-            .yield(try GRPCMessage<models_HelloResponse>(builder: &builder))
-        } catch {
-          continuation.finish(throwing: error)
-        }
-      }
-
-      continuation.finish()
-    }
-    try await response.write(contentsOf: stream)
-  }
-
-  func Update(
-    request: GRPCCore.RPCAsyncSequence<
-      GRPCMessage<models_HelloResponse>,
-      any Swift.Error
-    >,
-    response: GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext) async throws
-  {
-    for try await message in request {
-      let model = try message.decode()
-      print("## GreeterService.Update: \(model.message)")
-      var builder = FlatBufferBuilder(initialSize: 128)
-      let off = builder.create(string: "Hello \(model.message ?? "Unknown")")
-      let root = models_HelloResponse.createHelloResponse(
-        &builder,
-        messageOffset: off)
-      builder.finish(offset: root)
-      try await response
-        .write(try GRPCMessage<models_HelloResponse>(builder: &builder))
-    }
-  }
-}

grpc/examples/swift/Greeter/Sources/Commands/Subcommands/ClientCommand.swift

@@ -1,140 +0,0 @@
-/*
- * Copyright 2024 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ArgumentParser
-import FlatBuffers
-import GRPCCore
-import GRPCNIOTransportHTTP2
-import Models
-
-enum ClientRequest: String, ExpressibleByArgument {
-  case get, expand, collect, update
-}
-
-struct ClientCommand: AsyncParsableCommand {
-  static let configuration = CommandConfiguration(
-    commandName: "client")
-
-  @Option(help: "Name to send to the server")
-  var name: String
-
-  @Option(help: "request type")
-  var request: ClientRequest
-
-  func run() async throws {
-    try await withGRPCClient(
-      transport: .http2NIOPosix(
-        target: .dns(host: "localhost", port: port),
-        transportSecurity: .plaintext))
-    {
-      let client = models_Greeter.Client(wrapping: $0)
-
-      switch request {
-      case .get: try await get(client: client)
-      case .expand: try await expand(client: client)
-      case .collect: try await collect(client: client)
-      case .update: try await update(client: client)
-      }
-    }
-  }
-
-  func get(
-    client: models_Greeter
-      .Client<HTTP2ClientTransport.Posix>) async throws
-  {
-    for _ in 0..<3 {
-      var builder = FlatBufferBuilder(initialSize: 64)
-      let off = builder.create(string: name)
-      let root = models_HelloRequest.createHelloRequest(
-        &builder,
-        nameOffset: off)
-      builder.finish(offset: root)
-
-      let response = try await client
-        .Get(GRPCMessage(builder: &builder))
-      let message = try? response.decode().message
-      print("get message: \(message ?? "nil")")
-    }
-  }
-
-  func expand(
-    client: models_Greeter
-      .Client<HTTP2ClientTransport.Posix>) async throws
-  {
-    for _ in 0..<3 {
-      var builder = FlatBufferBuilder(initialSize: 64)
-      let off = builder.create(string: name)
-      let root = models_HelloRequest.createHelloRequest(
-        &builder,
-        nameOffset: off)
-      builder.finish(offset: root)
-      try await client.Expand(GRPCMessage(builder: &builder)) { response in
-        for try await message in response.messages {
-          let message = try? message.decode().message
-          print("expand message: \(message ?? "nil")")
-        }
-      }
-    }
-  }
-
-  func collect(
-    client: models_Greeter
-      .Client<HTTP2ClientTransport.Posix>) async throws
-  {
-    for _ in 0..<3 {
-      let response = try await client.Collect { writer in
-        for part in name {
-          print("collect sending: \(part)")
-          var builder = FlatBufferBuilder(initialSize: 64)
-          let off = builder.create(string: String(part))
-          let root = models_HelloRequest.createHelloRequest(
-            &builder,
-            nameOffset: off)
-          builder.finish(offset: root)
-          try await writer.write(GRPCMessage(builder: &builder))
-        }
-      }
-
-      let message = try response.decode().message
-      print("collect message: \(message ?? "nil")")
-    }
-  }
-
-  func update(
-    client: models_Greeter
-      .Client<HTTP2ClientTransport.Posix>) async throws
-  {
-    for _ in 0..<3 {
-      try await client.Update { writer in
-        for part in name {
-          print("update sending: \(part)")
-          var builder = FlatBufferBuilder(initialSize: 64)
-          let off = builder.create(string: String(part))
-          let root = models_HelloRequest.createHelloRequest(
-            &builder,
-            nameOffset: off)
-          builder.finish(offset: root)
-          try await writer.write(GRPCMessage(builder: &builder))
-        }
-      } onResponse: { response in
-        for try await message in response.messages {
-          let message = try message.decode().message
-          print("collect message: \(message ?? "nil")")
-        }
-      }
-    }
-  }
-}

grpc/examples/swift/Greeter/Sources/Commands/Subcommands/ServerCommand.swift

@@ -1,39 +0,0 @@
-/*
- * Copyright 2024 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ArgumentParser
-import GRPCCore
-import GRPCNIOTransportHTTP2
-
-struct ServerCommand: AsyncParsableCommand {
-  static let configuration = CommandConfiguration(
-    commandName: "serve")
-
-  func run() async throws {
-    let server = GRPCServer(
-      transport: .http2NIOPosix(
-        address: .ipv4(host: "127.0.0.1", port: port),
-        transportSecurity: .plaintext),
-      services: [GreeterService()])
-
-    try await withThrowingDiscardingTaskGroup { group in
-      group.addTask { try await server.serve() }
-      if let address = try await server.listeningAddress {
-        print("Echo listening on \(address)")
-      }
-    }
-  }
-}

grpc/examples/swift/Greeter/Sources/Model/greeter.grpc.swift

@@ -0,0 +1,147 @@
+// Generated GRPC code for FlatBuffers swift!
+/// The following code is generated by the Flatbuffers library which might not be in sync with grpc-swift
+/// in case of an issue please open github issue, though it would be maintained
+
+// swiftlint:disable all
+// swiftformat:disable all
+
+#if !os(Windows)
+import Foundation
+import GRPC
+import NIO
+import NIOHTTP1
+import FlatBuffers
+
+public protocol GRPCFlatBufPayload: GRPCPayload, FlatBufferGRPCMessage {}
+public extension GRPCFlatBufPayload {
+  init(serializedByteBuffer: inout NIO.ByteBuffer) throws {
+    self.init(byteBuffer: FlatBuffers.ByteBuffer(contiguousBytes: serializedByteBuffer.readableBytesView, count: serializedByteBuffer.readableBytes))
+  }
+  func serialize(into buffer: inout NIO.ByteBuffer) throws {
+    withUnsafeReadableBytes { buffer.writeBytes($0) }
+  }
+}
+extension Message: GRPCFlatBufPayload {}
+
+/// Usage: instantiate models_GreeterServiceClient, then call methods of this protocol to make API calls.
+public protocol models_GreeterClientProtocol: GRPCClient {
+
+  var serviceName: String { get }
+
+  var interceptors: models_GreeterClientInterceptorFactoryProtocol? { get }
+
+  func SayHello(
+    _ request: Message<models_HelloRequest>
+    , callOptions: CallOptions?
+  ) -> UnaryCall<Message<models_HelloRequest>, Message<models_HelloReply>>
+
+  func SayManyHellos(
+    _ request: Message<models_HelloRequest>
+    , callOptions: CallOptions?,
+    handler: @escaping (Message<models_HelloReply>) -> Void
+  ) -> ServerStreamingCall<Message<models_HelloRequest>, Message<models_HelloReply>>
+
+}
+
+extension models_GreeterClientProtocol {
+
+  public var serviceName: String { "models.Greeter" }
+
+  public func SayHello(
+    _ request: Message<models_HelloRequest>
+    , callOptions: CallOptions? = nil
+  ) -> UnaryCall<Message<models_HelloRequest>, Message<models_HelloReply>> {
+    return self.makeUnaryCall(
+      path: "/models.Greeter/SayHello",
+      request: request,
+      callOptions: callOptions ?? self.defaultCallOptions,
+      interceptors: self.interceptors?.makeSayHelloInterceptors() ?? []
+    )
+  }
+
+  public func SayManyHellos(
+    _ request: Message<models_HelloRequest>
+    , callOptions: CallOptions? = nil,
+    handler: @escaping (Message<models_HelloReply>) -> Void
+  ) -> ServerStreamingCall<Message<models_HelloRequest>, Message<models_HelloReply>> {
+    return self.makeServerStreamingCall(
+      path: "/models.Greeter/SayManyHellos",
+      request: request,
+      callOptions: callOptions ?? self.defaultCallOptions,
+      interceptors: self.interceptors?.makeSayManyHellosInterceptors() ?? [],
+      handler: handler
+    )
+  }
+}
+
+public protocol models_GreeterClientInterceptorFactoryProtocol {
+  /// - Returns: Interceptors to use when invoking 'SayHello'.
+  func makeSayHelloInterceptors() -> [ClientInterceptor<Message<models_HelloRequest>, Message<models_HelloReply>>]
+
+  /// - Returns: Interceptors to use when invoking 'SayManyHellos'.
+  func makeSayManyHellosInterceptors() -> [ClientInterceptor<Message<models_HelloRequest>, Message<models_HelloReply>>]
+
+}
+
+public final class models_GreeterServiceClient: models_GreeterClientProtocol {
+  public let channel: GRPCChannel
+  public var defaultCallOptions: CallOptions
+  public var interceptors: models_GreeterClientInterceptorFactoryProtocol?
+
+  public init(
+    channel: GRPCChannel,
+    defaultCallOptions: CallOptions = CallOptions(),
+    interceptors: models_GreeterClientInterceptorFactoryProtocol? = nil
+  ) {
+    self.channel = channel
+    self.defaultCallOptions = defaultCallOptions
+    self.interceptors = interceptors
+  }
+}
+
+public protocol models_GreeterProvider: CallHandlerProvider {
+  var interceptors: models_GreeterServerInterceptorFactoryProtocol? { get }
+  func SayHello(request: Message<models_HelloRequest>, context: StatusOnlyCallContext) -> EventLoopFuture<Message<models_HelloReply>>
+  func SayManyHellos(request: Message<models_HelloRequest>, context: StreamingResponseCallContext<Message<models_HelloReply>>) -> EventLoopFuture<GRPCStatus>
+}
+
+public extension models_GreeterProvider {
+
+  var serviceName: Substring { return "models.Greeter" }
+
+  func handle(method name: Substring, context: CallHandlerContext) -> GRPCServerHandlerProtocol? {
+    switch name {
+    case "SayHello":
+    return UnaryServerHandler(
+      context: context,
+      requestDeserializer: GRPCPayloadDeserializer<Message<models_HelloRequest>>(),
+      responseSerializer: GRPCPayloadSerializer<Message<models_HelloReply>>(),
+      interceptors: self.interceptors?.makeSayHelloInterceptors() ?? [],
+      userFunction: self.SayHello(request:context:))
+
+    case "SayManyHellos":
+    return ServerStreamingServerHandler(
+      context: context,
+      requestDeserializer: GRPCPayloadDeserializer<Message<models_HelloRequest>>(),
+      responseSerializer: GRPCPayloadSerializer<Message<models_HelloReply>>(),
+      interceptors: self.interceptors?.makeSayManyHellosInterceptors() ?? [],
+      userFunction: self.SayManyHellos(request:context:))
+
+    default: return nil;
+    }
+  }
+
+}
+
+public protocol models_GreeterServerInterceptorFactoryProtocol {
+  /// - Returns: Interceptors to use when handling 'SayHello'.
+  ///   Defaults to calling `self.makeInterceptors()`.
+  func makeSayHelloInterceptors() -> [ServerInterceptor<Message<models_HelloRequest>, Message<models_HelloReply>>]
+
+  /// - Returns: Interceptors to use when handling 'SayManyHellos'.
+  ///   Defaults to calling `self.makeInterceptors()`.
+  func makeSayManyHellosInterceptors() -> [ServerInterceptor<Message<models_HelloRequest>, Message<models_HelloReply>>]
+
+}
+#endif
+

grpc/examples/swift/Greeter/Sources/Model/greeter_generated.swift

@@ -8,7 +8,7 @@ import Common
 
 import FlatBuffers
 
-public struct models_HelloResponse: FlatBufferVerifiableTable, FlatbuffersVectorInitializable {
+public struct models_HelloReply: FlatBufferTable, FlatbuffersVectorInitializable, Verifiable {
 
   static func validateVersion() { FlatBuffersVersion_25_12_19() }
   public var __buffer: ByteBuffer! { return _accessor.bb }
@@ -23,16 +23,16 @@ public struct models_HelloResponse: FlatBufferVerifiableTable, FlatbuffersVector
 
   public var message: String? { let o = _accessor.offset(VT.message); return o == 0 ? nil : _accessor.string(at: o) }
   public var messageSegmentArray: [UInt8]? { return _accessor.getVector(at: VT.message) }
-  public static func startHelloResponse(_ fbb: inout FlatBufferBuilder) -> UOffset { fbb.startTable(with: 1) }
+  public static func startHelloReply(_ fbb: inout FlatBufferBuilder) -> UOffset { fbb.startTable(with: 1) }
   public static func add(message: Offset, _ fbb: inout FlatBufferBuilder) { fbb.add(offset: message, at: VT.message) }
-  public static func endHelloResponse(_ fbb: inout FlatBufferBuilder, start: UOffset) -> Offset { let end = Offset(offset: fbb.endTable(at: start)); return end }
-  public static func createHelloResponse(
+  public static func endHelloReply(_ fbb: inout FlatBufferBuilder, start: UOffset) -> Offset { let end = Offset(offset: fbb.endTable(at: start)); return end }
+  public static func createHelloReply(
     _ fbb: inout FlatBufferBuilder,
     messageOffset message: Offset = Offset()
   ) -> Offset {
-    let __start = models_HelloResponse.startHelloResponse(&fbb)
-    models_HelloResponse.add(message: message, &fbb)
-    return models_HelloResponse.endHelloResponse(&fbb, start: __start)
+    let __start = models_HelloReply.startHelloReply(&fbb)
+    models_HelloReply.add(message: message, &fbb)
+    return models_HelloReply.endHelloReply(&fbb, start: __start)
   }
 
   public static func verify<T>(_ verifier: inout Verifier, at position: Int, of type: T.Type) throws where T: Verifiable {
@@ -42,7 +42,7 @@ public struct models_HelloResponse: FlatBufferVerifiableTable, FlatbuffersVector
   }
 }
 
-extension models_HelloResponse: Encodable {
+extension models_HelloReply: Encodable {
   enum CodingKeys: String, CodingKey {
     case message = "message"
   }
@@ -53,7 +53,7 @@ extension models_HelloResponse: Encodable {
   }
 }
 
-public struct models_HelloRequest: FlatBufferVerifiableTable, FlatbuffersVectorInitializable {
+public struct models_HelloRequest: FlatBufferTable, FlatbuffersVectorInitializable, Verifiable {
 
   static func validateVersion() { FlatBuffersVersion_25_12_19() }
   public var __buffer: ByteBuffer! { return _accessor.bb }

grpc/examples/swift/Greeter/Sources/Models/greeter_v2.grpc.swift

@@ -1,572 +0,0 @@
-// Generated GRPC code for FlatBuffers swift!
-/// The following code is generated by the Flatbuffers library which might not be in sync with grpc-swift
-/// in case of an issue please open github issue, though it would be maintained
-
-// swiftlint:disable all
-// swiftformat:disable all
-
-#if !os(Windows) && compiler(>=6.0)
-import FlatBuffers
-import Foundation
-import GRPCCore
-import GRPCNIOTransportCore
-
-
-/// Usage: instantiate models.GreeterServiceClient, then call methods of this protocol to make API calls.
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension FlatBuffersMessageSerializer: MessageSerializer {
-  public func serialize<Bytes>(_ message: Message) throws -> Bytes where Bytes : GRPCCore.GRPCContiguousBytes {
-    do {
-      return try self.serialize(message: message) { GRPCNIOTransportBytes($0) } as! Bytes
-    } catch let error {
-      throw RPCError(
-        code: .invalidArgument,
-        message: "Can't serialize message",
-        cause: error
-      )
-    }
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension FlatBuffersMessageDeserializer: MessageDeserializer {
-  public func deserialize<Bytes>(_ serializedMessageBytes: Bytes) throws -> Message where Bytes : GRPCCore.GRPCContiguousBytes {
-    do {
-      return try serializedMessageBytes.withUnsafeBytes {
-        try self.deserialize(pointer: $0)
-      }
-    } catch let error {
-      throw RPCError(
-        code: .invalidArgument,
-        message: "Can't Decode message of type \(Message.self)",
-        cause: error
-      )
-    }
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-public enum models_Greeter: Sendable {
-  public static let descriptor = GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter")
-  public enum Method: Sendable {
-    public enum Get: Sendable {
-      public typealias Input = FlatBufferBuilder
-      public typealias Output = models_HelloResponse
-      public static let descriptor = GRPCCore.MethodDescriptor(
-        service: GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter"),
-        method: "Get"
-      )
-    }
-    public enum Collect: Sendable {
-      public typealias Input = FlatBufferBuilder
-      public typealias Output = models_HelloResponse
-      public static let descriptor = GRPCCore.MethodDescriptor(
-        service: GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter"),
-        method: "Collect"
-      )
-    }
-    public enum Expand: Sendable {
-      public typealias Input = FlatBufferBuilder
-      public typealias Output = models_HelloResponse
-      public static let descriptor = GRPCCore.MethodDescriptor(
-        service: GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter"),
-        method: "Expand"
-      )
-    }
-    public enum Update: Sendable {
-      public typealias Input = FlatBufferBuilder
-      public typealias Output = models_HelloResponse
-      public static let descriptor = GRPCCore.MethodDescriptor(
-        service: GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter"),
-        method: "Update"
-      )
-    }
-    public static let descriptors: [GRPCCore.MethodDescriptor] = [
-      Get.descriptor,
-      Collect.descriptor,
-      Expand.descriptor,
-      Update.descriptor,
-    ]
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension GRPCCore.ServiceDescriptor {
-  public static let models_Greeter = GRPCCore.ServiceDescriptor(fullyQualifiedService: "models.Greeter")
-}
-
-// MARK: models.Greeter Server
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter {
-  public protocol StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
-    func Get(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Collect(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Expand(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Update(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-  }
-  
-  public protocol ServiceProtocol: models_Greeter.StreamingServiceProtocol {
-    func Get(
-      request: GRPCCore.ServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Collect(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Expand(
-      request: GRPCCore.ServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-    func Update(
-      request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>
-    
-  }
-  
-  public protocol SimpleServiceProtocol: models_Greeter.ServiceProtocol {
-    func Get(
-      request: GRPCMessage<models_HelloResponse>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCMessage<models_HelloResponse>
-    
-    func Collect(
-      request: GRPCCore.RPCAsyncSequence<GRPCMessage<models_HelloResponse>, any Swift.Error>,
-      context: GRPCCore.ServerContext
-    ) async throws -> GRPCMessage<models_HelloResponse>
-    
-    func Expand(
-      request: GRPCMessage<models_HelloResponse>,
-      response: GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws
-    
-    func Update(
-      request: GRPCCore.RPCAsyncSequence<GRPCMessage<models_HelloResponse>, any Swift.Error>,
-      response: GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>,
-      context: GRPCCore.ServerContext
-    ) async throws
-    
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter.StreamingServiceProtocol {
-  public func registerMethods<Transport>(with router: inout GRPCCore.RPCRouter<Transport>) where Transport: GRPCCore.ServerTransport {
-    router.registerHandler(
-      forMethod: models_Greeter.Method.Get.descriptor,
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      handler: { request, context in
-        try await self.Get(
-          request: request,
-          context: context
-        )
-      }
-    )
-    router.registerHandler(
-      forMethod: models_Greeter.Method.Collect.descriptor,
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      handler: { request, context in
-        try await self.Collect(
-          request: request,
-          context: context
-        )
-      }
-    )
-    router.registerHandler(
-      forMethod: models_Greeter.Method.Expand.descriptor,
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      handler: { request, context in
-        try await self.Expand(
-          request: request,
-          context: context
-        )
-      }
-    )
-    router.registerHandler(
-      forMethod: models_Greeter.Method.Update.descriptor,
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      handler: { request, context in
-        try await self.Update(
-          request: request,
-          context: context
-        )
-      }
-    )
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter.ServiceProtocol {
-  public func Get(
-    request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>> {
-    let response = try await self.Get(
-      request: GRPCCore.ServerRequest(stream: request),
-      context: context
-    )
-    return GRPCCore.StreamingServerResponse(single: response)
-  }
-  public func Collect(
-    request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>> {
-    let response = try await self.Collect(
-      request: request,
-      context: context
-    )
-    return GRPCCore.StreamingServerResponse(single: response)
-  }
-  public func Expand(
-    request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>> {
-    let response = try await self.Expand(
-      request: GRPCCore.ServerRequest(stream: request),
-      context: context
-    )
-    return response
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter.SimpleServiceProtocol {
-  public func Get(
-    request: GRPCCore.ServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>> {
-    return GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>>(
-      message: try await self.Get(
-        request: request.message,
-        context: context
-      ),
-      metadata: [:]
-    )
-  }
-  public func Collect(
-    request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>> {
-    return GRPCCore.ServerResponse<GRPCMessage<models_HelloResponse>>(
-      message: try await self.Collect(
-        request: request.messages,
-        context: context
-      ),
-      metadata: [:]
-    )
-  }
-  public func Expand(
-    request: GRPCCore.ServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>> {
-    return GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>(
-      metadata: [:],
-      producer: { writer in
-        try await self.Expand(
-          request: request.message,
-          response: writer,
-          context: context
-        )
-        return [:]
-      }
-    )
-  }
-  public func Update(
-    request: GRPCCore.StreamingServerRequest<GRPCMessage<models_HelloResponse>>,
-    context: GRPCCore.ServerContext
-  ) async throws -> GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>> {
-    return GRPCCore.StreamingServerResponse<GRPCMessage<models_HelloResponse>>(
-      metadata: [:],
-      producer: { writer in
-        try await self.Update(
-          request: request.messages,
-          response: writer,
-          context: context
-        )
-        return [:]
-      }
-    )
-  }
-}
-
-
-// MARK: models.Greeter Client
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter {
-  public protocol ClientProtocol: Sendable {
-    func Get<Result>(
-      request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable
-    
-    func Collect<Result>(
-      request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable
-    
-    func Expand<Result>(
-      request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable
-    
-    func Update<Result>(
-      request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable
-    
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter {
-  public struct Client<Transport>: ClientProtocol where Transport: GRPCCore.ClientTransport {
-    private let client: GRPCCore.GRPCClient<Transport>
-    
-    public init(wrapping client: GRPCCore.GRPCClient<Transport>) {
-      self.client = client
-    }
-    
-    public func Get<Result>(
-      request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions = .defaults,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { response in try response.message }
-    ) async throws -> Result where Result: Sendable {
-      try await self.client.unary(
-        request: request,
-        descriptor: models_Greeter.Method.Get.descriptor,
-        serializer: serializer,
-        deserializer: deserializer,
-        options: options,
-        onResponse: handleResponse
-      )
-    }
-    
-    public func Collect<Result>(
-      request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions = .defaults,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { response in try response.message }
-    ) async throws -> Result where Result: Sendable {
-      try await self.client.clientStreaming(
-        request: request,
-        descriptor: models_Greeter.Method.Collect.descriptor,
-        serializer: serializer,
-        deserializer: deserializer,
-        options: options,
-        onResponse: handleResponse
-      )
-    }
-    
-    public func Expand<Result>(
-      request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions = .defaults,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable {
-      try await self.client.serverStreaming(
-        request: request,
-        descriptor: models_Greeter.Method.Expand.descriptor,
-        serializer: serializer,
-        deserializer: deserializer,
-        options: options,
-        onResponse: handleResponse
-      )
-    }
-    
-    public func Update<Result>(
-      request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-      serializer: some GRPCCore.MessageSerializer<GRPCMessage<models_HelloResponse>>,
-      deserializer: some GRPCCore.MessageDeserializer<GRPCMessage<models_HelloResponse>>,
-      options: GRPCCore.CallOptions = .defaults,
-      onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-    ) async throws -> Result where Result: Sendable {
-      try await self.client.bidirectionalStreaming(
-        request: request,
-        descriptor: models_Greeter.Method.Update.descriptor,
-        serializer: serializer,
-        deserializer: deserializer,
-        options: options,
-        onResponse: handleResponse
-      )
-    }
-    
-  }
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter.ClientProtocol {
-  public func Get<Result>(
-    request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { response in try response.message }
-  ) async throws -> Result where Result: Sendable {
-    try await self.Get(
-      request: request,
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Collect<Result>(
-    request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { response in try response.message }
-  ) async throws -> Result where Result: Sendable {
-    try await self.Collect(
-      request: request,
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Expand<Result>(
-    request: GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>,
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-  ) async throws -> Result where Result: Sendable {
-    try await self.Expand(
-      request: request,
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Update<Result>(
-    request: GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>,
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-  ) async throws -> Result where Result: Sendable {
-    try await self.Update(
-      request: request,
-      serializer: FlatBuffersMessageSerializer<GRPCMessage<models_HelloResponse>>(),
-      deserializer: FlatBuffersMessageDeserializer<GRPCMessage<models_HelloResponse>>(),
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-}
-
-@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
-extension models_Greeter.ClientProtocol {
-  public func Get<Result>(
-    _ message: GRPCMessage<models_HelloResponse>,
-    metadata: GRPCCore.Metadata = [:],
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { try $0.message }
-  ) async throws -> Result where Result: Sendable {
-    let request = GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>(
-      message: message,
-      metadata: metadata
-    )
-    return try await self.Get(
-      request: request,
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Collect<Result>(
-    metadata: GRPCCore.Metadata = [:],
-    options: GRPCCore.CallOptions = .defaults,
-    requestProducer producer: @Sendable @escaping (GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>) async throws -> Void,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result = { try $0.message }
-  ) async throws -> Result where Result: Sendable {
-    let request = GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>(
-      metadata: metadata,
-      producer: producer
-    )
-    return try await self.Collect(
-      request: request,
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Expand<Result>(
-    _ message: GRPCMessage<models_HelloResponse>,
-    metadata: GRPCCore.Metadata = [:],
-    options: GRPCCore.CallOptions = .defaults,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-  ) async throws -> Result where Result: Sendable {
-    let request = GRPCCore.ClientRequest<GRPCMessage<models_HelloResponse>>(
-      message: message,
-      metadata: metadata
-    )
-    return try await self.Expand(
-      request: request,
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-  public func Update<Result>(
-    metadata: GRPCCore.Metadata = [:],
-    options: GRPCCore.CallOptions = .defaults,
-    requestProducer producer: @Sendable @escaping (GRPCCore.RPCWriter<GRPCMessage<models_HelloResponse>>) async throws -> Void,
-    onResponse handleResponse: @Sendable @escaping (GRPCCore.StreamingClientResponse<GRPCMessage<models_HelloResponse>>) async throws -> Result
-  ) async throws -> Result where Result: Sendable {
-    let request = GRPCCore.StreamingClientRequest<GRPCMessage<models_HelloResponse>>(
-      metadata: metadata,
-      producer: producer
-    )
-    return try await self.Update(
-      request: request,
-      options: options,
-      onResponse: handleResponse
-    )
-  }
-  
-}
-
-#endif
-

grpc/examples/swift/Greeter/Sources/client/main.swift

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2024 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import FlatBuffers
+import GRPC
+import Logging
+import Model
+import NIO
+
+// Quieten the logs.
+LoggingSystem.bootstrap {
+  var handler = StreamLogHandler.standardOutput(label: $0)
+  handler.logLevel = .critical
+  return handler
+}
+
+func greet(name: String, client greeter: models_GreeterServiceClient) {
+  // Form the request with the name, if one was provided.
+  var builder = FlatBufferBuilder()
+  let nameOff = builder.create(string: name)
+  let root = models_HelloRequest.createHelloRequest(
+    &builder,
+    nameOffset: nameOff)
+  builder.finish(offset: root)
+
+  // Make the RPC call to the server.
+  let sayHello =
+    greeter
+      .SayHello(Message<models_HelloRequest>(builder: &builder))
+
+  // wait() on the response to stop the program from exiting before the response is received.
+  do {
+    let response = try sayHello.response.wait()
+    print("Greeter SayHello received: \(response.object.message ?? "Unknown")")
+  } catch {
+    print("Greeter failed: \(error)")
+  }
+
+  let surname = builder.create(string: name)
+  let manyRoot = models_HelloRequest.createHelloRequest(
+    &builder,
+    nameOffset: surname)
+  builder.finish(offset: manyRoot)
+
+  let call = greeter.SayManyHellos(Message(builder: &builder)) { message in
+    print(
+      "Greeter SayManyHellos received: \(message.object.message  ?? "Unknown")")
+  }
+
+  let status = try! call.status.recover { _ in .processingError }.wait()
+  if status.code != .ok {
+    print("RPC failed: \(status)")
+  }
+}
+
+func main(args: [String]) {
+  // arg0 (dropped) is the program name. We expect arg1 to be the port, and arg2 (optional) to be
+  // the name sent in the request.
+  let arg1 = args.dropFirst(1).first
+  let arg2 = args.dropFirst(2).first
+
+  switch (arg1.flatMap(Int.init), arg2) {
+  case (.none, _):
+    print("Usage: PORT [NAME]")
+    exit(1)
+
+  case (.some(let port), let name):
+    // Setup an `EventLoopGroup` for the connection to run on.
+    //
+    // See: https://github.com/apple/swift-nio#eventloops-and-eventloopgroups
+    let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+
+    // Make sure the group is shutdown when we're done with it.
+    defer {
+      try! group.syncShutdownGracefully()
+    }
+
+    // Configure the channel, we're not using TLS so the connection is `insecure`.
+    let channel = ClientConnection.insecure(group: group)
+      .connect(host: "localhost", port: port)
+
+    // Close the connection when we're done with it.
+    defer {
+      try! channel.close().wait()
+    }
+
+    // Provide the connection to the generated client.
+    let greeter = models_GreeterServiceClient(channel: channel)
+
+    // Do the greeting.
+    greet(name: name ?? "FlatBuffers!", client: greeter)
+  }
+}
+
+main(args: CommandLine.arguments)

grpc/examples/swift/Greeter/Sources/server/main.swift

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2024 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import FlatBuffers
+import GRPC
+import Logging
+import Model
+import NIO
+
+class Greeter: models_GreeterProvider {
+
+  var interceptors: models_GreeterServerInterceptorFactoryProtocol?
+
+  let greetings: [String]
+
+  init() {
+    greetings = ["Hi", "Hallo", "Ciao"]
+  }
+
+  func SayHello(
+    request: Message<models_HelloRequest>,
+    context: StatusOnlyCallContext)
+    -> EventLoopFuture<Message<models_HelloReply>>
+  {
+    let recipient = request.object.name ?? "Stranger"
+
+    var builder = FlatBufferBuilder()
+    let off = builder.create(string: "Hello \(recipient)")
+    let root = models_HelloReply.createHelloReply(&builder, messageOffset: off)
+    builder.finish(offset: root)
+    return context.eventLoop
+      .makeSucceededFuture(Message<models_HelloReply>(builder: &builder))
+  }
+
+  func SayManyHellos(
+    request: Message<models_HelloRequest>,
+    context: StreamingResponseCallContext<Message<models_HelloReply>>)
+    -> EventLoopFuture<GRPCStatus>
+  {
+    for name in greetings {
+      var builder = FlatBufferBuilder()
+      let off =
+        builder
+          .create(string: "\(name) \(request.object.name ?? "Unknown")")
+      let root = models_HelloReply.createHelloReply(
+        &builder,
+        messageOffset: off)
+      builder.finish(offset: root)
+      _ = context.sendResponse(Message<models_HelloReply>(builder: &builder))
+    }
+    return context.eventLoop.makeSucceededFuture(.ok)
+  }
+}
+
+// Quieten the logs.
+LoggingSystem.bootstrap {
+  var handler = StreamLogHandler.standardOutput(label: $0)
+  handler.logLevel = .critical
+  return handler
+}
+
+let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+defer {
+  try! group.syncShutdownGracefully()
+}
+
+// Create some configuration for the server:
+let configuration = Server.Configuration(
+  target: .hostAndPort("localhost", 0),
+  eventLoopGroup: group,
+  serviceProviders: [Greeter()])
+
+// Start the server and print its address once it has started.
+let server = Server.start(configuration: configuration)
+server.map {
+  $0.channel.localAddress
+}.whenSuccess { address in
+  print("server started on port \(address!.port!)")
+}
+
+// Wait on the server's `onClose` future to stop the program from exiting.
+_ = try server.flatMap {
+  $0.onClose
+}.wait()

grpc/examples/ts/greeter/src/models.ts

@@ -2,5 +2,5 @@
 
 /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 
-export { HelloReply } from './models/hello-reply.js';
-export { HelloRequest } from './models/hello-request.js';
+export {HelloReply} from './models/hello-reply.js';
+export {HelloRequest} from './models/hello-request.js';

grpc/examples/ts/greeter/src/models/hello-reply.ts

@@ -8,7 +8,7 @@ import * as flatbuffers from 'flatbuffers';
 
 export class HelloReply {
   bb: flatbuffers.ByteBuffer|null = null;
-  bb_pos = 0;
+  bb_pos: number = 0;
   __init(i:number, bb:flatbuffers.ByteBuffer):HelloReply {
   this.bb_pos = i;
   this.bb = bb;
@@ -31,11 +31,11 @@ message(optionalEncoding?:any):string|Uint8Array|null {
   return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
 }
 
-static startHelloReply(builder:flatbuffers.Builder) {
+static startHelloReply(builder:flatbuffers.Builder):void {
   builder.startObject(1);
 }
 
-static addMessage(builder:flatbuffers.Builder, messageOffset:flatbuffers.Offset) {
+static addMessage(builder:flatbuffers.Builder, messageOffset:flatbuffers.Offset):void {
   builder.addFieldOffset(0, messageOffset, 0);
 }
 

grpc/examples/ts/greeter/src/models/hello-request.ts

@@ -8,7 +8,7 @@ import * as flatbuffers from 'flatbuffers';
 
 export class HelloRequest {
   bb: flatbuffers.ByteBuffer|null = null;
-  bb_pos = 0;
+  bb_pos: number = 0;
   __init(i:number, bb:flatbuffers.ByteBuffer):HelloRequest {
   this.bb_pos = i;
   this.bb = bb;
@@ -31,11 +31,11 @@ name(optionalEncoding?:any):string|Uint8Array|null {
   return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
 }
 
-static startHelloRequest(builder:flatbuffers.Builder) {
+static startHelloRequest(builder:flatbuffers.Builder):void {
   builder.startObject(1);
 }
 
-static addName(builder:flatbuffers.Builder, nameOffset:flatbuffers.Offset) {
+static addName(builder:flatbuffers.Builder, nameOffset:flatbuffers.Offset):void {
   builder.addFieldOffset(0, nameOffset, 0);
 }