1 files changed, 13 insertions, 8 deletions
diff --git a/src/Erebos/Service.hs b/src/Erebos/Service.hs
index e95e700..4499ef9 100644
--- a/src/Erebos/Service.hs
+++ b/src/Erebos/Service.hs
@@ -29,14 +29,14 @@ import Control.Monad.Writer
 
 import Data.Kind
 import Data.Typeable
-import Data.UUID (UUID)
-import qualified Data.UUID as U
 
 import Erebos.Identity
 import {-# SOURCE #-} Erebos.Network
+import Erebos.Network.Protocol
 import Erebos.State
 import Erebos.Storable
 import Erebos.Storage.Head
+import Erebos.UUID qualified as U
 
 class (
         Typeable s, Storable s,
@@ -72,6 +72,9 @@ class (
     serviceStorageWatchers :: proxy s -> [SomeStorageWatcher s]
     serviceStorageWatchers _ = []
 
+    serviceStopServer :: proxy s -> Server -> ServiceGlobalState s -> [ ( Peer, ServiceState s ) ] -> IO ()
+    serviceStopServer _ _ _ _ = return ()
+
 
 data SomeService = forall s. Service s => SomeService (Proxy s) (ServiceAttributes s)
 
@@ -101,11 +104,10 @@ someServiceEmptyGlobalState :: SomeService -> SomeServiceGlobalState
 someServiceEmptyGlobalState (SomeService p _) = SomeServiceGlobalState p (emptyServiceGlobalState p)
 
 
-data SomeStorageWatcher s = forall a. Eq a => SomeStorageWatcher (Stored LocalState -> a) (a -> ServiceHandler s ())
-
+data SomeStorageWatcher s
+    = forall a. Eq a => SomeStorageWatcher (Stored LocalState -> a) (a -> ServiceHandler s ())
+    | forall a. Eq a => GlobalStorageWatcher (Stored LocalState -> a) (Server -> a -> ExceptT ErebosError IO ())
 
-newtype ServiceID = ServiceID UUID
-    deriving (Eq, Ord, Show, StorableUUID)
 
 mkServiceID :: String -> ServiceID
 mkServiceID = maybe (error "Invalid service ID") ServiceID . U.fromString
@@ -116,10 +118,13 @@ data ServiceInput s = ServiceInput
     , svcPeerIdentity :: UnifiedIdentity
     , svcServer :: Server
     , svcPrintOp :: String -> IO ()
+    , svcNewStreams :: [ RawStreamReader ]
     }
 
-data ServiceReply s = ServiceReply (Either s (Stored s)) Bool
-                    | ServiceFinally (IO ())
+data ServiceReply s
+    = ServiceReply (Either s (Stored s)) Bool
+    | ServiceOpenStream (RawStreamWriter -> IO ())
+    | ServiceFinally (IO ())
 
 data ServiceHandlerState s = ServiceHandlerState
     { svcValue :: ServiceState s