fix: adding explicit grpc port

Dimy Jeannot · Dimy Jeannot · commit b3526b05344a · 2025-10-09T19:12:09.000-04:00
diff --git a/apps/clients/public/cli/v2alpha/oeco/go.mod b/apps/clients/public/cli/v2alpha/oeco/go.mod
@@ -3,7 +3,7 @@ module github.com/openecosystems/ecosystem/apps/clients/public/cli/v2alpha/oeco
 go 1.24.6
 
 require (
-	connectrpc.com/connect v1.19.0
+	connectrpc.com/connect v1.19.1
 	github.com/apex/log v1.9.0
 	github.com/charmbracelet/bubbles v0.21.0
 	github.com/charmbracelet/bubbletea v1.3.5
diff --git a/apps/workloads/public/cryptography/v2alpha/encryption/go.mod b/apps/workloads/public/cryptography/v2alpha/encryption/go.mod
@@ -3,7 +3,7 @@ module github.com/openecosystems/ecosystem/apps/workloads/public/cryptography/v2
 go 1.24.6
 
 require (
-	connectrpc.com/connect v1.19.0
+	connectrpc.com/connect v1.19.1
 	github.com/openecosystems/ecosystem/go/oeco-sdk/v2beta v0.19.3
 	go.opentelemetry.io/otel/trace v1.37.0
 )
diff --git a/apps/workloads/public/dns/v2alpha/dynamic-dns/go.mod b/apps/workloads/public/dns/v2alpha/dynamic-dns/go.mod
@@ -5,7 +5,7 @@ go 1.24.6
 require github.com/openecosystems/ecosystem/go/oeco-sdk/v2beta v0.19.3
 
 require (
-	connectrpc.com/connect v1.19.0 // indirect
+	connectrpc.com/connect v1.19.1 // indirect
 	connectrpc.com/vanguard v0.3.0 // indirect
 	dario.cat/mergo v1.0.2 // indirect
 	github.com/BurntSushi/toml v1.5.0 // indirect
diff --git a/apps/workloads/public/ecosystem/v2alpha/ecosystem/go.mod b/apps/workloads/public/ecosystem/v2alpha/ecosystem/go.mod
@@ -3,7 +3,7 @@ module github.com/openecosystems/ecosystem/apps/workloads/public/ecosystem/v2alp
 go 1.24.6
 
 require (
-	connectrpc.com/connect v1.19.0
+	connectrpc.com/connect v1.19.1
 	connectrpc.com/otelconnect v0.7.2
 	connectrpc.com/vanguard v0.3.0
 	go.uber.org/zap v1.27.0
diff --git a/go.work.sum b/go.work.sum
@@ -536,6 +536,8 @@ cloud.google.com/go/workflows v1.13.2 h1:jYIxrDOVCGvTBHIAVhqQ+P8fhE0trm+Hf2hgL1Y
 cloud.google.com/go/workflows v1.13.2/go.mod h1:l5Wj2Eibqba4BsADIRzPLaevLmIuYF2W+wfFBkRG3vU=
 connectrpc.com/connect v1.19.0 h1:LuqUbq01PqbtL0o7vn0WMRXzR2nNsiINe5zfcJ24pJM=
 connectrpc.com/connect v1.19.0/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
+connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
+connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
 connectrpc.com/grpcreflect v1.2.0 h1:Q6og1S7HinmtbEuBvARLNwYmTbhEGRpHDhqrPNlmK+U=
 connectrpc.com/grpcreflect v1.2.0/go.mod h1:nwSOKmE8nU5u/CidgHtPYk1PFI3U9ignz7iDMxOYkSY=
 connectrpc.com/otelconnect v0.7.2/go.mod h1:JS7XUKfuJs2adhCnXhNHPHLz6oAaZniCJdSF00OZSew=
diff --git a/go/oeco-sdk/v2beta/bindings/nats/configurer.go b/go/oeco-sdk/v2beta/bindings/nats/configurer.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"os"
 
 	"github.com/nats-io/nats.go"
 	sdkv2betalib "github.com/openecosystems/ecosystem/go/oeco-sdk/v2beta"
@@ -96,7 +97,11 @@ func (b *Binding) ValidateConfiguration() error {
 	if b.configuration.Natsd.Clustered {
 
 		if b.configuration.Natsd.ServerName == "" {
-			errs = append(errs, errors.New("Natsd.ServerName is required"))
+			if podName, ok := os.LookupEnv("POD_NAME"); ok && podName != "" {
+				b.configuration.Natsd.ServerName = podName
+			} else {
+				errs = append(errs, errors.New("Natsd.ServerName is required (missing and POD_NAME not set)"))
+			}
 		}
 
 		if b.configuration.Natsd.Cluster.Host == "" {
diff --git a/go/oeco-sdk/v2beta/gen/platform/spec/v2/spec_settings.pb.go b/go/oeco-sdk/v2beta/gen/platform/spec/v2/spec_settings.pb.go
diff --git a/go/oeco-sdk/v2beta/go.mod b/go/oeco-sdk/v2beta/go.mod
@@ -5,7 +5,7 @@ go 1.24.6
 require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250717165733-d22d418d82d8.1
 	buf.build/go/protovalidate v0.14.0
-	connectrpc.com/connect v1.19.0
+	connectrpc.com/connect v1.19.1
 	connectrpc.com/vanguard v0.3.0
 	dario.cat/mergo v1.0.2
 	github.com/apex/log v1.9.0
diff --git a/go/oeco-sdk/v2beta/server.go b/go/oeco-sdk/v2beta/server.go
@@ -41,6 +41,7 @@ type Server struct {
 	NetListener             *net.Listener
 
 	options          *serverOptions
+	publicGRPCServer *http.Server
 	publicHTTPServer *http.Server
 	meshHTTPServer   *http.Server
 	// err     error
@@ -214,6 +215,7 @@ func (server *Server) listenAndServe(ln *net.Listener) (httpServerErr chan error
 		return
 	}
 
+	publicGrpcEndpoint := settings.Platform.GetGrpcEndpoint()
 	publicEndpoint := settings.Platform.GetEndpoint()
 	meshEndpoint := settings.Platform.Mesh.GetEndpoint()
 
@@ -250,6 +252,16 @@ func (server *Server) listenAndServe(ln *net.Listener) (httpServerErr chan error
 	server.MeshHTTPServerHandler = meshMux
 	meshMux.Handle("/", server.MeshServiceHandler)
 
+	publicGRPCServer := &http.Server{
+		Addr: publicGrpcEndpoint,
+		// Use h2c so we can serve HTTP/2 without TLS.
+		Handler:      h2c.NewHandler(edgeRouter(publicMux), server.PublicConnectHTTPServer),
+		ReadTimeout:  5 * time.Second,  // Time allowed to read the request
+		WriteTimeout: 10 * time.Second, // Time allowed to write the response
+		IdleTimeout:  15 * time.Second, // Time for keep-alive connections
+	}
+	server.publicGRPCServer = publicGRPCServer
+
 	publicHTTPServer := &http.Server{
 		Addr: publicEndpoint,
 		// Use h2c so we can serve HTTP/2 without TLS.
@@ -276,7 +288,12 @@ func (server *Server) listenAndServe(ln *net.Listener) (httpServerErr chan error
 		go func() {
 			_httpServerErr <- server.publicHTTPServer.ListenAndServe()
 		}()
-		fmt.Println("Public HTTP1.1/HTTP2.0/gRPC/gRPC-Web/Connect listening on " + settings.Platform.Endpoint)
+		fmt.Println("Public HTTP1.1/HTTP2.0/Connect listening on " + settings.Platform.Endpoint)
+
+		go func() {
+			_httpServerErr <- server.publicGRPCServer.ListenAndServe()
+		}()
+		fmt.Println("Public gRPC listening on " + settings.Platform.GrpcEndpoint)
 	}
 
 	if server.MeshConnectHTTPServer != nil {
@@ -321,6 +338,10 @@ func (server *Server) Shutdown() {
 		if err := server.publicHTTPServer.Shutdown(ctx); err != nil {
 			fmt.Println("Public server shutdown error:", err)
 		}
+
+		if err := server.publicGRPCServer.Shutdown(ctx); err != nil {
+			fmt.Println("Public gRPC server shutdown error:", err)
+		}
 	}
 
 	if server.MeshConnectHTTPServer != nil {
diff --git a/libs/plugins/protoc-gen-platform/languages/typescript/plugins/client/templates/class_open.ts.tmpl b/libs/plugins/protoc-gen-platform/languages/typescript/plugins/client/templates/class_open.ts.tmpl
@@ -6,9 +6,13 @@ export class AdinoSDK {
     constructor(private readonly options: AdinoSDKOptions) {
         const interceptor = new SpecInterceptor(options);
         const baseUrl = this.options.baseUrl ?? BaseUrl;
+        const interceptors: Interceptor[] = [
+            ...(this.options.interceptors ?? []),
+            interceptor.spec,
+        ];
         this.transport = createConnectTransport({
             baseUrl: baseUrl,
             defaultTimeoutMs: this.options.timeoutMs,
-            interceptors: [interceptor.spec],
+            interceptors: interceptors,
         });
     }
diff --git a/libs/plugins/protoc-gen-platform/languages/typescript/plugins/client/templates/file.ts.tmpl b/libs/plugins/protoc-gen-platform/languages/typescript/plugins/client/templates/file.ts.tmpl
@@ -2,7 +2,7 @@
 import {BaseUrl} from './constants.js';
 import type { AdinoSDKOptions, AdinoCallOptions } from './options.js';
 import { createConnectOptions } from './options.js';
-import {CallOptions, Client, createClient, Transport} from '@connectrpc/connect';
+import {CallOptions, Client, createClient, Transport, Interceptor} from '@connectrpc/connect';
 import {createConnectTransport} from '@connectrpc/connect-web';
 import {SpecInterceptor} from "./interceptors.js";
 import {fromJson, toJson} from '@bufbuild/protobuf';
diff --git a/proto/protobuf/platform/spec/v2/spec_settings.proto b/proto/protobuf/platform/spec/v2/spec_settings.proto
@@ -46,11 +46,12 @@ message Platform {
 
   string api_endpoint = 10;
   string api_key = 20;
-  string endpoint = 30;
-  bool insecure = 40;
-  repeated string dns_endpoints = 50;
-  bool dynamic_config_reload = 60;
-  Mesh mesh = 70;
+  string grpc_endpoint = 30;
+  string endpoint = 40;
+  bool insecure = 50;
+  repeated string dns_endpoints = 60;
+  bool dynamic_config_reload = 70;
+  Mesh mesh = 80;
 }
 
 message Mesh {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/openecosystems/ecosystem/apps/workloads/public/cryptography/v2`
`3`	`3`	`go 1.24.6`
`4`	`4`
`5`	`5`	`require (`
`6`		`- connectrpc.com/connect v1.19.0`
	`6`	`+ connectrpc.com/connect v1.19.1`
`7`	`7`	`github.com/openecosystems/ecosystem/go/oeco-sdk/v2beta v0.19.3`
`8`	`8`	`go.opentelemetry.io/otel/trace v1.37.0`
`9`	`9`	`)`