diff --git a/README.md b/README.md index 8f7d89b..0c63e77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# websockets-simple +# typed-websockets High-level interface for websockets. @@ -19,8 +19,8 @@ High-level interface for websockets. ```haskell {-# LANGUAGE DeriveAnyClass, DeriveGeneric, OverloadedStrings #-} module Main where -import qualified Network.WebSockets.Simple.Client as WClient -import qualified Network.WebSockets.Simple.Server as WServer +import qualified Network.WebSockets.Typed.Client as WClient +import qualified Network.WebSockets.Typed.Server as WServer import qualified Network.WebSockets as WS -- using cbor as an example, aeson would work too import qualified Codec.Serialise as Serialise diff --git a/src/Network/WebSockets/Simple/Client.hs b/src/Network/WebSockets/Typed/Client.hs similarity index 92% rename from src/Network/WebSockets/Simple/Client.hs rename to src/Network/WebSockets/Typed/Client.hs index 77cb62e..2f5012b 100644 --- a/src/Network/WebSockets/Simple/Client.hs +++ b/src/Network/WebSockets/Typed/Client.hs @@ -1,4 +1,4 @@ -module Network.WebSockets.Simple.Client +module Network.WebSockets.Typed.Client ( Options (..), defaultOptions, run, @@ -14,8 +14,8 @@ import Data.ByteString.Char8 (unpack) import Data.Maybe (isJust) import Network.WebSockets qualified as WS import Network.WebSockets.Connection.PingPong qualified as PingPong -import Network.WebSockets.Simple.Session qualified as Session -import Network.WebSockets.Simple.Utils qualified as Utils +import Network.WebSockets.Typed.Session qualified as Session +import Network.WebSockets.Typed.Utils qualified as Utils import Stamina qualified import Wuss qualified diff --git a/src/Network/WebSockets/Simple/Server.hs b/src/Network/WebSockets/Typed/Server.hs similarity index 93% rename from src/Network/WebSockets/Simple/Server.hs rename to src/Network/WebSockets/Typed/Server.hs index daa1184..ee13319 100644 --- a/src/Network/WebSockets/Simple/Server.hs +++ b/src/Network/WebSockets/Typed/Server.hs @@ -1,4 +1,4 @@ -module Network.WebSockets.Simple.Server +module Network.WebSockets.Typed.Server ( Options (..), defaultOptions, run, @@ -16,8 +16,8 @@ import Data.ByteString.Char8 (unpack) import Data.Foldable (for_) import Network.WebSockets qualified as WS import Network.WebSockets.Connection.PingPong qualified as PingPong -import Network.WebSockets.Simple.Session qualified as Session -import Network.WebSockets.Simple.Utils qualified as Utils +import Network.WebSockets.Typed.Session qualified as Session +import Network.WebSockets.Typed.Utils qualified as Utils data Options a = Options { handlePendingConnection :: (ClientConnection a) => WS.PendingConnection -> IO (Maybe a), diff --git a/src/Network/WebSockets/Simple/Session.hs b/src/Network/WebSockets/Typed/Session.hs similarity index 98% rename from src/Network/WebSockets/Simple/Session.hs rename to src/Network/WebSockets/Typed/Session.hs index f0c90bf..16ea3b2 100644 --- a/src/Network/WebSockets/Simple/Session.hs +++ b/src/Network/WebSockets/Typed/Session.hs @@ -1,4 +1,4 @@ -module Network.WebSockets.Simple.Session +module Network.WebSockets.Typed.Session ( Codec (..), run, Session (..), diff --git a/src/Network/WebSockets/Simple/Utils.hs b/src/Network/WebSockets/Typed/Utils.hs similarity index 96% rename from src/Network/WebSockets/Simple/Utils.hs rename to src/Network/WebSockets/Typed/Utils.hs index c72432e..bac729b 100644 --- a/src/Network/WebSockets/Simple/Utils.hs +++ b/src/Network/WebSockets/Typed/Utils.hs @@ -1,4 +1,4 @@ -module Network.WebSockets.Simple.Utils where +module Network.WebSockets.Typed.Utils where import Control.Exception (Exception, throwIO) import Data.ByteString (ByteString) diff --git a/websockets-simple.cabal b/typed-websockets.cabal similarity index 77% rename from websockets-simple.cabal rename to typed-websockets.cabal index 39b9763..ff63f54 100644 --- a/websockets-simple.cabal +++ b/typed-websockets.cabal @@ -1,16 +1,16 @@ cabal-version: 3.4 -name: websockets-simple +name: typed-websockets version: 1.0 -synopsis: Simple websockets server +synopsis: Typed websockets server/client -- description: -homepage: https://github.com/cachix/websockets-simple +homepage: https://github.com/cachix/typed-websockets license: Apache-2.0 author: Domen Kožar maintainer: domen@cachix.org --- copyright: build-type: Simple -extra-doc-files: CHANGELOG.md --- extra-source-files: +extra-doc-files: + README.md + CHANGELOG.md common common ghc-options: -Wall -Wcompat -Wincomplete-record-updates @@ -34,11 +34,11 @@ common common library import: common exposed-modules: - Network.WebSockets.Simple.Server - Network.WebSockets.Simple.Client + Network.WebSockets.Typed.Server + Network.WebSockets.Typed.Client other-modules: - Network.WebSockets.Simple.Session - Network.WebSockets.Simple.Utils + Network.WebSockets.Typed.Session + Network.WebSockets.Typed.Utils hs-source-dirs: src default-language: GHC2021 @@ -48,7 +48,7 @@ executable readme build-depends: base, markdown-unlit, websockets, - websockets-simple, + typed-websockets, string-conv, serialise, text,