refactored orchestrator and callbacks service to use pkg messsaging + envelope factory / handler

api/edge/callbacks/internal/config/module.go

@@ -10,15 +10,6 @@ import (
 const (
 	defaultShutdownTimeoutSeconds = 15
 	defaultMetricsAddress         = ":9420"
-	defaultIngestStream           = "CALLBACKS"
-	defaultIngestSubject          = "callbacks.events"
-	defaultIngestDurable          = "callbacks-ingest"
-	defaultIngestBatchSize        = 32
-	defaultIngestFetchTimeoutMS   = 2000
-	defaultIngestIdleSleepMS      = 500
-	defaultTaskCollection         = "callback_tasks"
-	defaultInboxCollection        = "callback_inbox"
-	defaultEndpointsCollection    = "webhook_endpoints"
 	defaultWorkerConcurrency      = 8
 	defaultWorkerPollIntervalMS   = 200
 	defaultLockTTLSeconds         = 30
@@ -42,7 +33,6 @@ type Config struct {
 	Metrics   *MetricsConfig    `yaml:"metrics"`
 	Database  *db.Config        `yaml:"database"`
 	Messaging *messaging.Config `yaml:"messaging"`
-	Ingest    IngestConfig      `yaml:"ingest"`
 	Delivery  DeliveryConfig    `yaml:"delivery"`
 	Security  SecurityConfig    `yaml:"security"`
 	Secrets   SecretsConfig     `yaml:"secrets"`
@@ -72,30 +62,6 @@ func (c *MetricsConfig) ListenAddress() string {
 	return c.Address
 }
 
-// IngestConfig configures JetStream ingestion.
-type IngestConfig struct {
-	Stream         string `yaml:"stream"`
-	Subject        string `yaml:"subject"`
-	Durable        string `yaml:"durable"`
-	BatchSize      int    `yaml:"batch_size"`
-	FetchTimeoutMS int    `yaml:"fetch_timeout_ms"`
-	IdleSleepMS    int    `yaml:"idle_sleep_ms"`
-}
-
-func (c *IngestConfig) FetchTimeout() time.Duration {
-	if c.FetchTimeoutMS <= 0 {
-		return time.Duration(defaultIngestFetchTimeoutMS) * time.Millisecond
-	}
-	return time.Duration(c.FetchTimeoutMS) * time.Millisecond
-}
-
-func (c *IngestConfig) IdleSleep() time.Duration {
-	if c.IdleSleepMS <= 0 {
-		return time.Duration(defaultIngestIdleSleepMS) * time.Millisecond
-	}
-	return time.Duration(c.IdleSleepMS) * time.Millisecond
-}
-
 // DeliveryConfig controls dispatcher behavior.
 type DeliveryConfig struct {
 	WorkerConcurrency int     `yaml:"worker_concurrency"`

api/edge/callbacks/internal/config/service.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bytes"
 	"os"
 	"strings"
 
@@ -34,7 +35,9 @@ func (s *service) Load(path string) (*Config, error) {
 	}
 
 	cfg := &Config{}
-	if err := yaml.Unmarshal(data, cfg); err != nil {
+	decoder := yaml.NewDecoder(bytes.NewReader(data))
+	decoder.KnownFields(true)
+	if err := decoder.Decode(cfg); err != nil {
 		s.logger.Error("Failed to parse config yaml", zap.String("path", path), zap.Error(err))
 		return nil, merrors.InternalWrap(err, "failed to parse callbacks config")
 	}
@@ -58,25 +61,6 @@ func (s *service) applyDefaults(cfg *Config) {
 		cfg.Metrics.Address = defaultMetricsAddress
 	}
 
-	if strings.TrimSpace(cfg.Ingest.Stream) == "" {
-		cfg.Ingest.Stream = defaultIngestStream
-	}
-	if strings.TrimSpace(cfg.Ingest.Subject) == "" {
-		cfg.Ingest.Subject = defaultIngestSubject
-	}
-	if strings.TrimSpace(cfg.Ingest.Durable) == "" {
-		cfg.Ingest.Durable = defaultIngestDurable
-	}
-	if cfg.Ingest.BatchSize <= 0 {
-		cfg.Ingest.BatchSize = defaultIngestBatchSize
-	}
-	if cfg.Ingest.FetchTimeoutMS <= 0 {
-		cfg.Ingest.FetchTimeoutMS = defaultIngestFetchTimeoutMS
-	}
-	if cfg.Ingest.IdleSleepMS <= 0 {
-		cfg.Ingest.IdleSleepMS = defaultIngestIdleSleepMS
-	}
-
 	if cfg.Delivery.WorkerConcurrency <= 0 {
 		cfg.Delivery.WorkerConcurrency = defaultWorkerConcurrency
 	}
@@ -139,9 +123,6 @@ func (s *service) validate(cfg *Config) error {
 	if cfg.Delivery.MaxAttempts < 1 {
 		return merrors.InvalidArgument("delivery.max_attempts must be > 0", "delivery.max_attempts")
 	}
-	if cfg.Ingest.BatchSize < 1 {
-		return merrors.InvalidArgument("ingest.batch_size must be > 0", "ingest.batch_size")
-	}
 	vaultAddress := strings.TrimSpace(cfg.Secrets.Vault.Address)
 	vaultTokenEnv := strings.TrimSpace(cfg.Secrets.Vault.TokenEnv)
 	vaultMountPath := strings.TrimSpace(cfg.Secrets.Vault.MountPath)