main.go

@@ -42,30 +42,17 @@ type InterServiceMessage struct {
 
 // NewServiceInitializationInformation creates a new ServiceInitializationInformation and is only ever meant to be called
 // by fulgens or a compliant implementation of fulgens.
-func NewServiceInitializationInformation(domain *string, outbox chan<- InterServiceMessage, inbox <-chan InterServiceMessage, router *chi.Mux, configuration map[string]interface{}, resourceDir fs.FS) *ServiceInitializationInformation {
+func NewServiceInitializationInformation(domain *string, outbox chan<- InterServiceMessage, inbox <-chan InterServiceMessage, router *chi.Mux, configuration map[string]interface{}, resourceDir fs.FS) ServiceInitializationInformation {
-	return &ServiceInitializationInformation{
+	return ServiceInitializationInformation{
 		Domain:        domain,
 		Outbox:        outbox,
 		inbox:         inbox,
 		Router:        router,
 		Configuration: configuration,
 		ResourceDir:   resourceDir,
-		internal: internal{
-			buffer:      make(map[uuid.UUID]InterServiceMessage),
-			waitingList: make(map[uuid.UUID]struct{}),
-			arrived:     make(chan uuid.UUID),
-		},
 	}
 }
 
-type internal struct {
-	buffer      map[uuid.UUID]InterServiceMessage
-	waitingList map[uuid.UUID]struct{}
-	mutex       sync.Mutex
-	arrived     chan uuid.UUID
-	ispStarted  bool
-}
-
 type ServiceInitializationInformation struct {
 	Service       *Service `validate:"required"`
 	Domain        *string
@@ -74,7 +61,6 @@ type ServiceInitializationInformation struct {
 	Router        *chi.Mux
 	Configuration map[string]interface{}
 	ResourceDir   fs.FS
-	internal      internal
 }
 
 // YesIAbsolutelyKnowWhatIAmDoingAndIWantToAccessTheRawInbox returns a channel that can be used to read messages from
@@ -106,19 +92,25 @@ const (
 	Unauthorized
 )
 
+var buffer = make(map[uuid.UUID]InterServiceMessage)
+var waitingList = make(map[uuid.UUID]struct{})
+var mutex = sync.Mutex{}
+var arrived = make(chan uuid.UUID)
+var ispStarted = false
+
 func (s *ServiceInitializationInformation) StartISProcessor() {
-	if s.internal.ispStarted {
+	if ispStarted {
 		return
 	} else {
-		s.internal.ispStarted = true
+		ispStarted = true
 	}
 	listener := NewListener(s.inbox)
 	for {
 		msg := listener.AcceptMessage()
-		s.internal.mutex.Lock()
+		mutex.Lock()
-		s.internal.buffer[msg.MessageID] = msg
+		buffer[msg.MessageID] = msg
-		s.internal.mutex.Unlock()
+		mutex.Unlock()
-		s.internal.arrived <- msg.MessageID
+		arrived <- msg.MessageID
 	}
 }
 
@@ -126,18 +118,18 @@ var (
 	ErrTimeout = errors.New("timeout")
 )
 
-func (s *ServiceInitializationInformation) AwaitISMessage(id uuid.UUID, timeout time.Duration) (InterServiceMessage, error) {
+func AwaitISMessage(id uuid.UUID, timeout time.Duration) (InterServiceMessage, error) {
 	for {
 		select {
 		case <-time.After(timeout):
 			return InterServiceMessage{}, ErrTimeout
-		case msgID := <-s.internal.arrived:
+		case msgID := <-arrived:
 			if msgID == id {
-				s.internal.mutex.Lock()
+				mutex.Lock()
-				msg := s.internal.buffer[id]
+				msg := buffer[id]
-				delete(s.internal.buffer, id)
+				delete(buffer, id)
-				delete(s.internal.waitingList, id)
+				delete(waitingList, id)
-				s.internal.mutex.Unlock()
+				mutex.Unlock()
 				if msg.MessageType != Success {
 					return msg, msg.Message.(error)
 				}
@@ -158,8 +150,7 @@ func NewListener(c <-chan InterServiceMessage) Listener {
 }
 
 func (l DefaultListener) AcceptMessage() InterServiceMessage {
-	msg := <-l
+	return <-l
-	return msg
 }
 
 func (s *ServiceInitializationInformation) SendISMessage(forService uuid.UUID, messageType MessageCode, message any) uuid.UUID {
@@ -172,35 +163,24 @@ func (s *ServiceInitializationInformation) SendISMessage(forService uuid.UUID, m
 		SentAt:       time.Now(),
 		Message:      message,
 	}
-	s.internal.mutex.Lock()
+	mutex.Lock()
-	s.internal.waitingList[id] = struct{}{}
+	waitingList[id] = struct{}{}
-	s.internal.mutex.Unlock()
+	mutex.Unlock()
 	s.Outbox <- msg
 	return id
 }
 
-func (s *InterServiceMessage) Respond(messageType MessageCode, message any, information *ServiceInitializationInformation) {
-	n := *s
-	n.ServiceID, n.ForServiceID = n.ForServiceID, n.ServiceID
-	n.MessageType = messageType
-	n.Message = message
-	n.SentAt = time.Now()
-	information.Outbox <- n
-}
-
 func (s *ServiceInitializationInformation) SendAndAwaitISMessage(forService uuid.UUID, messageType MessageCode, message any, timeout time.Duration) (InterServiceMessage, error) {
 	id := s.SendISMessage(forService, messageType, message)
-	return s.AwaitISMessage(id, timeout)
+	return AwaitISMessage(id, timeout)
 }
 
-var databaseService = uuid.MustParse("00000000-0000-0000-0000-000000000001")
-
 func (s *ServiceInitializationInformation) GetDatabase() (Database, error) {
-	if !s.internal.ispStarted {
+	if !ispStarted {
 		go s.StartISProcessor()
 	}
 
-	response, err := s.SendAndAwaitISMessage(databaseService, 0, nil, 5*time.Second)
+	response, err := s.SendAndAwaitISMessage(uuid.Nil, 0, nil, 5*time.Second)
 	if err != nil {
 		return Database{}, err
 	}
@@ -210,17 +190,17 @@ func (s *ServiceInitializationInformation) GetDatabase() (Database, error) {
 
 func (s *ServiceInitializationInformation) AcceptMessage() InterServiceMessage {
 	for {
-		<-s.internal.arrived
+		<-arrived
-		s.internal.mutex.Lock()
+		mutex.Lock()
-		for id, msg := range s.internal.buffer {
+		for id, msg := range buffer {
-			_, ok := s.internal.waitingList[id]
+			_, ok := waitingList[id]
 
 			if !ok {
-				delete(s.internal.buffer, id)
+				delete(buffer, id)
-				s.internal.mutex.Unlock()
+				mutex.Unlock()
 				return msg
 			}
 		}
-		s.internal.mutex.Unlock()
+		mutex.Unlock()
 	}
 }