updating servicemesh library

cmd/bare_minimum/example_service.go

@@ -8,7 +8,7 @@ type example struct {
 	name string
 }
 
-func (e *example) Init(mesh servicemesh.M) {
+func (e *example) Init(mesh servicemesh.Mesh) {
 	return
 }
 

cmd/charm/simple_tui/bubbletea_wrapper_service.go

@@ -18,7 +18,7 @@ type bubbleteaService struct {
 	mux sync.Mutex
 }
 
-func (b *bubbleteaService) Init(mesh servicemesh.M) {
+func (b *bubbleteaService) Init(mesh servicemesh.Mesh) {
 	go b.runLoop()
 
 	b.bindExisting(mesh)
@@ -40,7 +40,7 @@ func (b *bubbleteaService) runLoop() {
 	}
 }
 
-func (b *bubbleteaService) bindExisting(mesh servicemesh.M) {
+func (b *bubbleteaService) bindExisting(mesh servicemesh.Mesh) {
 	var models []tea.Model
 
 	for _, service := range mesh.Services() {

cmd/charm/simple_tui/filepicker.go

@@ -16,7 +16,7 @@ type filePickerService struct {
 	model *filePickerModel
 }
 
-func (t *filePickerService) Init(mesh servicemesh.M) {
+func (t *filePickerService) Init(mesh servicemesh.Mesh) {
 	t.model = &filePickerModel{}
 }
 

cmd/config_file/service.go

@@ -19,7 +19,7 @@ type serviceThatUsesConfigManager struct {
 	log           *slog.Logger
 }
 
-func (s *serviceThatUsesConfigManager) ResolveDependencies(mesh servicemesh.M) {
+func (s *serviceThatUsesConfigManager) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if instance, ok := service.(config_file.Manager); ok {
 			s.configManager = instance
@@ -31,7 +31,7 @@ func (s *serviceThatUsesConfigManager) DependenciesResolved() bool {
 	return s.configManager != nil
 }
 
-func (s *serviceThatUsesConfigManager) Init(mesh servicemesh.M) {
+func (s *serviceThatUsesConfigManager) Init(mesh servicemesh.Mesh) {
 	cfg, err := s.configManager.GetConfig("test.json")
 	if err != nil {
 		s.log.Error("couldn't load example config file", "error", err)

cmd/dependency_injection/non_service_dependencies/service.go

@@ -50,7 +50,7 @@ func (s *Service) ResolveDependencies(_ pkg.IsRuntime) {
 	// to call Init unless until we have resolved our deps ourselves.
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	return
 }
 

cmd/dependency_injection/service_dependencies/serviceA/service.go

@@ -25,7 +25,7 @@ func (s *Service) A() string {
 	return "this message came from ServiceA"
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	s.log.Info("calling B()", "message from B", s.dependency.B())
 	return
 }
@@ -46,7 +46,7 @@ func (s *Service) DependenciesResolved() bool {
 	return s.dependency != nil
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	// here, we iterate over all services from the runtime
 	// and check if the service implements something we need.
 	for _, service := range mesh.Services() {

cmd/dependency_injection/service_dependencies/serviceB/service.go

@@ -25,7 +25,7 @@ func (s *Service) B() string {
 	return "this message came from ServiceB"
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	s.log.Info("calling A()", "message from A", s.dependency.A())
 	return
 }
@@ -46,7 +46,7 @@ func (s *Service) DependenciesResolved() bool {
 	return s.dependency != nil
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	// here, we iterate over all services from the runtime
 	// and check if the service implements something we need.
 	for _, service := range mesh.Services() {

cmd/events/custom_events/receiver.go

@@ -18,7 +18,7 @@ func (r *receiver) Logger() *slog.Logger {
 	return r.logger
 }
 
-func (r *receiver) Init(mesh servicemesh.M) {
+func (r *receiver) Init(mesh servicemesh.Mesh) {
 	mesh.Events().On("test", func(args ...any) {
 		r.logger.Info("event received", "event", "test", "args", args)
 	})

cmd/events/custom_events/sender.go

@@ -19,7 +19,7 @@ func (s *sender) Logger() *slog.Logger {
 	return s.logger
 }
 
-func (s *sender) Init(mesh servicemesh.M) {
+func (s *sender) Init(mesh servicemesh.Mesh) {
 	s.logger.Info("emitting 'test' event in 3 seconds...")
 
 	time.Sleep(time.Second * 3)

cmd/events/runtime_events/listener.go

@@ -18,7 +18,7 @@ func (s *listensForNewServices) Logger() *slog.Logger {
 	return s.logger
 }
 
-func (s *listensForNewServices) Init(mesh servicemesh.M) {
+func (s *listensForNewServices) Init(mesh servicemesh.Mesh) {
 	// noop
 }
 

cmd/events/runtime_events/other_service.go

@@ -10,7 +10,7 @@ type exampleService struct {
 	name string
 }
 
-func (e *exampleService) Init(mesh servicemesh.M) {
+func (e *exampleService) Init(mesh servicemesh.Mesh) {
 	// noop
 }
 

cmd/graceful_shutdown/example_service.go

@@ -19,7 +19,7 @@ func (e *example) Logger() *slog.Logger {
 	return e.l
 }
 
-func (e *example) Init(mesh servicemesh.M) {
+func (e *example) Init(mesh servicemesh.Mesh) {
 	return
 }
 

cmd/log_level/main.go

@@ -18,7 +18,7 @@ type service struct {
 	logger *slog.Logger
 }
 
-func (s *service) Init(mesh servicemesh.M) {
+func (s *service) Init(mesh servicemesh.Mesh) {
 	mesh.SetLogLevel(int(slog.LevelWarn))
 	s.logger.Debug("you should not see this")
 	s.logger.Info("you should not see this")

cmd/text_to_speech/example_service.go

@@ -17,15 +17,15 @@ func (s *exampleServiceThatUsesTts) DependenciesResolved() bool {
 	return s.tts != nil
 }
 
-func (s *exampleServiceThatUsesTts) ResolveDependencies(mesh servicemesh.M) {
+func (s *exampleServiceThatUsesTts) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(text_to_speech.ConvertsTextToSpeech); ok {
 			s.tts = candidate
 		}
 	}
 }
 
-func (s *exampleServiceThatUsesTts) Init(mesh servicemesh.M) {
+func (s *exampleServiceThatUsesTts) Init(mesh servicemesh.Mesh) {
 	go s.loopSpeakRandomStuff()
 }
 

cmd/twitch_integrated_text_to_speech/twitch_to_tts.go

@@ -50,15 +50,15 @@ func (g *glueService) DependenciesResolved() bool {
 	return g.tts != nil
 }
 
-func (g *glueService) ResolveDependencies(mesh servicemesh.M) {
+func (g *glueService) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(text_to_speech.ConvertsTextToSpeech); ok {
 			g.tts = candidate
 		}
 	}
 }
 
-func (g *glueService) Init(mesh servicemesh.M) {
+func (g *glueService) Init(mesh servicemesh.Mesh) {
 	// do nothing
 }
 

cmd/web_api/service.go

@@ -16,7 +16,7 @@ var (
 
 type exampleRouteInitializer struct{}
 
-func (s *exampleRouteInitializer) Init(mesh servicemesh.M) {
+func (s *exampleRouteInitializer) Init(mesh servicemesh.Mesh) {
 	// nothing to do
 }
 

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/google/uuid v1.5.0
 	github.com/gravestench/runtime v0.0.0-20231002182113-640425b821c6
-	github.com/gravestench/servicemesh v0.0.0-20231216212722-f13d113b25b2
+	github.com/gravestench/servicemesh v0.0.0-20231217212458-b62100fdfd7a
 	github.com/hegedustibor/htgo-tts v0.0.0-20230402053941-cd8d1a158135
 	golang.org/x/oauth2 v0.15.0
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661

services/cli_flags/service.go

@@ -34,7 +34,7 @@ func (s *Service) Logger() *slog.Logger {
 	return s.log
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	s.args = make([]string, len(os.Args))
 	copy(s.args, os.Args)
 
@@ -49,7 +49,7 @@ func (s *Service) Name() string {
 	return "CLI Flags"
 }
 
-func (s *Service) loopApplyFlags(manager servicemesh.M) {
+func (s *Service) loopApplyFlags(manager servicemesh.Mesh) {
 	for {
 		for _, candidate := range manager.Services() {
 			s.applyFlags(candidate)

services/config_file/service.go

@@ -38,7 +38,7 @@ func (s *Service) Name() string {
 }
 
 // Init satisfies the servicemesh.IsRuntimeService interface
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	s.configs = make(map[string]*Config)
 	s.servicesWithDefaultConfigs = make(map[string]HasDefaultConfig)
 

services/desktop_notification/service.go

@@ -15,7 +15,7 @@ type Service struct {
 	cfgManager config_file.Manager
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 
 }
 
@@ -35,7 +35,7 @@ func (s *Service) DependenciesResolved() bool {
 	return s.cfgManager != nil
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, candidate := range mesh.Services() {
 		if service, ok := candidate.(config_file.Manager); ok {
 			s.cfgManager = service

services/raylib_renderer/dependencies.go

@@ -17,7 +17,7 @@ func (s *Service) DependenciesResolved() bool {
 	return true
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(config_file.Manager); ok {
 			s.cfgManager = candidate

services/raylib_renderer/render.go

@@ -30,7 +30,7 @@ func (s *Service) initRenderer() {
 	})
 }
 
-func (s *Service) gatherLayers(mesh servicemesh.M) {
+func (s *Service) gatherLayers(mesh servicemesh.Mesh) {
 	for {
 		for _, service := range mesh.Services() {
 			if _, alreadyBound := s.layers[service.Name()]; alreadyBound {
@@ -46,7 +46,7 @@ func (s *Service) gatherLayers(mesh servicemesh.M) {
 	}
 }
 
-func (s *Service) renderServicesAsLayers(mesh servicemesh.M) {
+func (s *Service) renderServicesAsLayers(mesh servicemesh.Mesh) {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 

services/raylib_renderer/service.go

@@ -20,7 +20,7 @@ type Service struct {
 	order      []string
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	defer func() { _ = recover() /* don't worry about it */ }()
 
 	if s.layers == nil {

services/text_to_speech/dependencies.go

@@ -17,7 +17,7 @@ func (s *Service) DependenciesResolved() bool {
 	return true
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(config_file.Manager); ok {
 			s.cfgManager = candidate

services/text_to_speech/service.go

@@ -19,7 +19,7 @@ type Service struct {
 	speech     htgotts.Speech
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	var cfg *config_file.Config
 
 	for { // wait until the config or default config is saved + loaded

services/twitch_auth_code_grant_flow/dependencies.go

@@ -9,7 +9,7 @@ func (s *Service) DependenciesResolved() bool {
 	return s.cfg != nil
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(config_file.Dependency); ok {
 			s.cfg = candidate

services/twitch_auth_code_grant_flow/service.go

@@ -19,7 +19,7 @@ type Service struct {
 	token string
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 
 }
 

services/twitch_integration/dependencies.go

@@ -18,7 +18,7 @@ func (s *Service) DependenciesResolved() bool {
 	return true
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if candidate, ok := service.(config_file.Dependency); ok {
 			s.cfgManager = candidate

services/twitch_integration/event_handler_binding.go

@@ -8,7 +8,7 @@ import (
 
 // loopBindHandlers iterates over all services every second and binds event
 // handlers for services that implement interfaces found in abstract.go
-func (s *Service) loopBindHandlers(mesh servicemesh.M) {
+func (s *Service) loopBindHandlers(mesh servicemesh.Mesh) {
 	// we will keep track service we've already bound
 	bound := make(map[string]any)
 

services/twitch_integration/service.go

@@ -16,7 +16,7 @@ type Service struct {
 	twitchIrcClient *twitch.Client
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	go s.setupClient()
 	go s.loopBindHandlers(mesh)
 }

services/twitch_soundboard/dependencies.go

@@ -7,7 +7,7 @@ import (
 	"github.com/gravestench/servicemesh-examples/services/desktop_notification"
 )
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, service := range mesh.Services() {
 		if instance, ok := service.(config_file.Manager); ok {
 			s.configManager = instance

services/twitch_soundboard/service.go

@@ -17,7 +17,7 @@ type Service struct {
 	log           *slog.Logger
 }
 
-func (s *Service) Init(mesh servicemesh.M) {
+func (s *Service) Init(mesh servicemesh.Mesh) {
 	// nothing to do
 }
 

services/web_router/dependencies.go

@@ -14,7 +14,7 @@ func (s *Service) DependenciesResolved() bool {
 	return true
 }
 
-func (s *Service) ResolveDependencies(mesh servicemesh.M) {
+func (s *Service) ResolveDependencies(mesh servicemesh.Mesh) {
 	for _, other := range mesh.Services() {
 		if cfg, ok := other.(config_file.Manager); ok {
 			s.cfgManager = cfg