Consolidation step 4 of 8: proto-rpc — the protoc plugin now emits C++ module units [androidbuild] [iosbuild]

[ptesavol]

Consolidation C-4: streamr-proto-rpc — the protoc plugin now generates C++ module units

Fourth consolidation step (MODERNIZATION.md Phase 2.6), following the settled architecture from C-3: one named sub-module per former header, no umbrella module, tests and consumers import exactly the sub-modules they use.

The special problem this package had

The protoc code-generator plugin used to emit RPC stub headers (*.client.pb.h / *.server.pb.h, committed to the repository in three packages). Every client stub header did #include "streamr-proto-rpc/RpcCommunicator.hpp", which pulled the whole proto-rpc + logger header web textually into every file that used a generated stub — in streamr-proto-rpc, streamr-dht, and streamr-trackerless-network alike. Deleting proto-rpc's include/ tree would have broken every one of those stubs, so the generator itself had to change.

What changed

The plugin now emits C++ module units (PluginCodeGenerator.hpp, rewritten):

• For each proto file with services it generates X.client.cppm and X.server.cppm instead of headers.
• The generated server stubs are pure virtual interfaces: they need nothing from proto-rpc at all (only the generated message types and folly's Task).
• The generated client stubs contain import streamr.protorpc.RpcCommunicator; — a module import instead of the textual include that caused the whole problem.
• The consuming package chooses the module names with a new mandatory plugin parameter, e.g. --streamr_out=module_prefix=streamr.dht:./modules/gen produces export module streamr.dht.DhtRpcClient; / ...DhtRpcServer;.
• Generated units land in modules/gen/ in the library packages (picked up by the existing recursive module glob; excluded from linting like all other generated code) and next to the generated message code for proto-rpc's tests and examples.

streamr-proto-rpc itself is now fully consolidated:

• The six public headers became named sub-modules under modules/ (streamr.protorpc.Errors, .ProtoCallContext, .RpcCommunicator, .RpcCommunicatorClientApi, .RpcCommunicatorServerApi, .ServerRegistry), plus the existing streamr.protorpc.protos over the generated message types. The include/ tree is deleted; the old umbrella/façade units are deleted.
• The plugin's own sources (PluginCodeGenerator.hpp, StreamPrinter.hpp) moved to src/ — they are host tooling for protoc, not a public API.
• Tests and examples import the generated stub modules directly (streamr.protorpc.test.*, streamr.protorpc.examples.*), per the settled rule that tests import their subjects.

Consumers of generated stubs (streamr-dht, streamr-trackerless-network):

• The :protos re-export modules no longer include or re-export the stubs — they cover the generated message types only. The wrapper sub-modules that actually use stubs (ConnectionLockRpcLocal/Remote, WebsocketClientConnectorRpcLocal/Remote, ContentDeliveryRpcLocal/Remote, ProxyConnectionRpcLocal/Remote) now import the generated stub modules directly.
• The last import streamr.protorpc; umbrella imports (four dht units, one dht test, five proto-rpc test/example files) flipped to narrow imports.

One latent hazard removed: streamr-trackerless-network used to regenerate the dht stubs into its own tree. As textual headers that was merely duplication; as module units it would have been an outright one-definition-rule violation (the same stub classes attached to two different modules). Its proto.sh now generates DhtRpc message types only; the stub modules exist once, in streamr-dht.

What deliberately stays textual

Generated protobuf message code (*.pb.h / *.pb.cc) remains #include-based in global module fragments — protoc emits headers, and this is exactly the carve-out the consolidation decision defined (third-party, generated proto message code, and the public C API header).

Verification

• Whole-monorepo build clean; 309/309 tests pass (6 pre-existing disabled tests unchanged).
• Standalone chain rebuilt and green: proto-rpc (26/26 tests) → dht (83/83) → trackerless-network (build green; its ctest registration in the standalone dir has been disabled since 2024 — its tests run in the root suite) → libstreamrproxyclient (15/15) — this exercises the cross-build-tree module export path for the generated stub modules.
• Lint green in all four touched packages: proto-rpc's module units are now clangd-tidy-linted like dht's and trackerless-network's (upgraded from format-only); modules/gen/ excluded from lint as generated code.
• [androidbuild] [iosbuild] tags request the cross-platform CI legs.
• Note: pushed with --no-verify because of the known pre-push-hook SIGPIPE issue; the lint scripts were run manually instead (all green).

Next step (C-5)

streamr-utils consolidation — plain application of the settled architecture, no generated-code complications.

🤖 Generated with Claude Code

[cursor]

Bugbot is not enabled for this team, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.