asakul
/
pontarius-xmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
622 Commits
1 Branch
0 Tags
2.6 MiB
Tree: 00f7221746
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '00f7221746'
${ noResults }
pontarius-xmpp/source/Network/Xmpp/Internal.hs

60 lines
1.3 KiB
Raw Normal View History Unescape

Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
-- |
-- Module: $Header$
Merge remote-tracking branch 'nejla/master' Conflicts: pontarius-xmpp.cabal source/Network/Xmpp/Basic.hs source/Network/Xmpp/Concurrent/Channels/Types.hs source/Network/Xmpp/Connection.hs source/Network/Xmpp/Errors.hs source/Network/Xmpp/Marshal.hs source/Network/Xmpp/Pickle.hs source/Network/Xmpp/Session.hs source/Network/Xmpp/Stream.hs source/Network/Xmpp/Tls.hs source/Network/Xmpp/Types.hs source/Network/Xmpp/Xep/InbandRegistration.hs
13 years ago
--
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
-- Maintainer: info@jonkri.com
-- Stability: unstable
-- Portability: portable
Merge remote-tracking branch 'nejla/master' Conflicts: pontarius-xmpp.cabal source/Network/Xmpp/Basic.hs source/Network/Xmpp/Concurrent/Channels/Types.hs source/Network/Xmpp/Connection.hs source/Network/Xmpp/Errors.hs source/Network/Xmpp/Marshal.hs source/Network/Xmpp/Pickle.hs source/Network/Xmpp/Session.hs source/Network/Xmpp/Stream.hs source/Network/Xmpp/Tls.hs source/Network/Xmpp/Types.hs source/Network/Xmpp/Xep/InbandRegistration.hs
13 years ago
--
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
-- This module allows for low-level access to Pontarius XMPP. Generally, the
-- "Network.Xmpp" module should be used instead.
Merge remote-tracking branch 'nejla/master' Conflicts: pontarius-xmpp.cabal source/Network/Xmpp/Basic.hs source/Network/Xmpp/Concurrent/Channels/Types.hs source/Network/Xmpp/Connection.hs source/Network/Xmpp/Errors.hs source/Network/Xmpp/Marshal.hs source/Network/Xmpp/Pickle.hs source/Network/Xmpp/Session.hs source/Network/Xmpp/Stream.hs source/Network/Xmpp/Tls.hs source/Network/Xmpp/Types.hs source/Network/Xmpp/Xep/InbandRegistration.hs
13 years ago
--
Join `Stream' and `Connection' The `Stream' and the `Connection' modules/concepts has been quite similar and, in some ways, overlapping. The `Stream' and `Connection' modules allow for direct access to the XML stream. The `Stream' module exported an API for opening, restarting, and closing the stream. The `Connection' module, on the other hand, allowed for pushing and pulling elements and stanzas to and from the stream. Furthermore, the `Connection' type was used in both the `Connection' module and the higher-level `Stream' module. This patch joins the two modules into one `Stream' module, and renames the `Connection' type to `Stream'. It also renames most other connection-related functions and types. Also, `connect' is renamed `openStream' and `closeStreams' is renamed `closeStream' (the stream is `bidirectional' in RFC 6120 terminology).
13 years ago
-- The 'Stream' object provides the most low-level access to the XMPP
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
-- stream: a simple and single-threaded interface which exposes the conduit
-- 'Event' source, as well as the input and output byte streams. Custom stateful
Join `Stream' and `Connection' The `Stream' and the `Connection' modules/concepts has been quite similar and, in some ways, overlapping. The `Stream' and `Connection' modules allow for direct access to the XML stream. The `Stream' module exported an API for opening, restarting, and closing the stream. The `Connection' module, on the other hand, allowed for pushing and pulling elements and stanzas to and from the stream. Furthermore, the `Connection' type was used in both the `Connection' module and the higher-level `Stream' module. This patch joins the two modules into one `Stream' module, and renames the `Connection' type to `Stream'. It also renames most other connection-related functions and types. Also, `connect' is renamed `openStream' and `closeStreams' is renamed `closeStream' (the stream is `bidirectional' in RFC 6120 terminology).
13 years ago
-- 'Stream' functions can be executed using 'withStream'.
Merge remote-tracking branch 'nejla/master' Conflicts: pontarius-xmpp.cabal source/Network/Xmpp/Basic.hs source/Network/Xmpp/Concurrent/Channels/Types.hs source/Network/Xmpp/Connection.hs source/Network/Xmpp/Errors.hs source/Network/Xmpp/Marshal.hs source/Network/Xmpp/Pickle.hs source/Network/Xmpp/Session.hs source/Network/Xmpp/Stream.hs source/Network/Xmpp/Tls.hs source/Network/Xmpp/Types.hs source/Network/Xmpp/Xep/InbandRegistration.hs
13 years ago
--
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
-- The TLS, SASL, and 'Session' functionalities of Pontarius XMPP are built on
-- top of this API.
Change module structure We can treat all functions related to SASL negotiation as a submodule to Pontarius XMPP if there are no dependencies from the internal Network.Xmpp modules to the SASL functionality. Because of this, `auth' and `authSimple' were moved from Session.hs to Sasl.hs. As the bind and the `{urn:ietf:params:xml:ns:xmpp-session}session' functionality are related only to the SASL negotation functionality, these functions has been moved to the SASL submodule as well. As these changes only leaves `connect' in the Session module, it seems fitting to move `connect' to Network.Xmpp.Stream (not Network.Xmpp.Connection, as `connect' depends on `startStream'). The internal Network.Xmpp modules (Connection.hs) no longer depend on the Concurrent submodule. This will decrease the coupling between Network.Xmpp and the concurrent implementation, making it easier for developers to replace the concurrent implementation if they wanted to. As Network.Xmpp.Connection is really a module that breaks the encapsulation that is Network.Xmpp and the concurrent interface, I have renamed it Network.Xmpp.Internal. As this frees up the Network.Xmpp.Connection name, Network.Xmpp.Connection_ can reclaim it. The high-level "utility" functions of Network.Xmpp.Utilities, Network.Xmpp.Presence, and Network.Xmpp.Message has been moved to Network.Xmpp.Utilities. This module contains functions that at most only depend on the internal Network.Xmpp.Types module, and doesn't belong in any other module. The functionality of Jid.hs was moved to Types.hs. Moved some of the functions of Network.Xmpp.Pickle to Network.Xmpp.Marshal, and removed the Network.Xmpp.Pickle module. A module imports diagram corresponding to the one of my last patch shows the new module structure. I also include a diagram showing the `Sasl' and `Concurrent' module imports.
13 years ago
module Network.Xmpp.Internal
structure Internal module
12 years ago
( -- * Stream
Stream(..)
Add `StreamSettings' record with `Default' instance
13 years ago
, StreamConfiguration(..)
Join `Stream' and `Connection' The `Stream' and the `Connection' modules/concepts has been quite similar and, in some ways, overlapping. The `Stream' and `Connection' modules allow for direct access to the XML stream. The `Stream' module exported an API for opening, restarting, and closing the stream. The `Connection' module, on the other hand, allowed for pushing and pulling elements and stanzas to and from the stream. Furthermore, the `Connection' type was used in both the `Connection' module and the higher-level `Stream' module. This patch joins the two modules into one `Stream' module, and renames the `Connection' type to `Stream'. It also renames most other connection-related functions and types. Also, `connect' is renamed `openStream' and `closeStreams' is renamed `closeStream' (the stream is `bidirectional' in RFC 6120 terminology).
13 years ago
, StreamState(..)
, StreamHandle(..)
Renamed some stream-related record fields Prefixed the fields with `stream'. `ServerFeatures' was renamed `StreamFeatures' to be more coherent with the terminology in RFC 6120.
13 years ago
, StreamFeatures(..)
Join `Stream' and `Connection' The `Stream' and the `Connection' modules/concepts has been quite similar and, in some ways, overlapping. The `Stream' and `Connection' modules allow for direct access to the XML stream. The `Stream' module exported an API for opening, restarting, and closing the stream. The `Connection' module, on the other hand, allowed for pushing and pulling elements and stanzas to and from the stream. Furthermore, the `Connection' type was used in both the `Connection' module and the higher-level `Stream' module. This patch joins the two modules into one `Stream' module, and renames the `Connection' type to `Stream'. It also renames most other connection-related functions and types. Also, `connect' is renamed `openStream' and `closeStreams' is renamed `closeStream' (the stream is `bidirectional' in RFC 6120 terminology).
13 years ago
, openStream
, withStream
structure Internal module
12 years ago
-- * TLS
move TLS preference check to startTLS and add PreferPlain
13 years ago
, tls
structure Internal module
12 years ago
, TlsBehaviour(..)
-- * Auth
, SaslHandler
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
, auth
structure Internal module
12 years ago
-- * Stanzas
, Stanza(..)
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
, pushStanza
, pullStanza
export writeStanza
12 years ago
, writeStanza
structure Internal module
12 years ago
-- ** IQ
, pushIQ
fix exports in Internal
12 years ago
, iqError
, iqResult
add associatedErrorType and iqErrorResponse
12 years ago
, associatedErrorType
Export Plugin, Plugin', and Annotation from Network.Xmpp.Internal
12 years ago
-- * Plugins
improve documentation Add type synonyms: Username, Password, AuthZID, AuthData and Resource
12 years ago
, Plugin
Export Plugin, Plugin', and Annotation from Network.Xmpp.Internal
12 years ago
, Plugin'(..)
, Annotation(..)
improve documentation Add type synonyms: Username, Password, AuthZID, AuthData and Resource
12 years ago
, connectTls
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
)
where
add associatedErrorType and iqErrorResponse
12 years ago
import Network.Xmpp.Concurrent.Basic
Export Plugin, Plugin', and Annotation from Network.Xmpp.Internal
12 years ago
import Network.Xmpp.Concurrent.Types
Change module structure We can treat all functions related to SASL negotiation as a submodule to Pontarius XMPP if there are no dependencies from the internal Network.Xmpp modules to the SASL functionality. Because of this, `auth' and `authSimple' were moved from Session.hs to Sasl.hs. As the bind and the `{urn:ietf:params:xml:ns:xmpp-session}session' functionality are related only to the SASL negotation functionality, these functions has been moved to the SASL submodule as well. As these changes only leaves `connect' in the Session module, it seems fitting to move `connect' to Network.Xmpp.Stream (not Network.Xmpp.Connection, as `connect' depends on `startStream'). The internal Network.Xmpp modules (Connection.hs) no longer depend on the Concurrent submodule. This will decrease the coupling between Network.Xmpp and the concurrent implementation, making it easier for developers to replace the concurrent implementation if they wanted to. As Network.Xmpp.Connection is really a module that breaks the encapsulation that is Network.Xmpp and the concurrent interface, I have renamed it Network.Xmpp.Internal. As this frees up the Network.Xmpp.Connection name, Network.Xmpp.Connection_ can reclaim it. The high-level "utility" functions of Network.Xmpp.Utilities, Network.Xmpp.Presence, and Network.Xmpp.Message has been moved to Network.Xmpp.Utilities. This module contains functions that at most only depend on the internal Network.Xmpp.Types module, and doesn't belong in any other module. The functionality of Jid.hs was moved to Types.hs. Moved some of the functions of Network.Xmpp.Pickle to Network.Xmpp.Marshal, and removed the Network.Xmpp.Pickle module. A module imports diagram corresponding to the one of my last patch shows the new module structure. I also include a diagram showing the `Sasl' and `Concurrent' module imports.
13 years ago
import Network.Xmpp.Sasl
Export functions necessary for external SASL handlers
13 years ago
import Network.Xmpp.Sasl.Types
add associatedErrorType and iqErrorResponse
12 years ago
import Network.Xmpp.Stanza
import Network.Xmpp.Stream
Hide `Context', add exports, extend documentation As mentioned in #pontarius, `Context' is simply a bunch of thread management features, and users that want that can build their own on top of the `Connection' layer. The benefit of hiding `Context' is that it makes the API clearer, and significantly decreases the complexity of the library. As the `Basic' module is simply an interface to `Connection', it was renamed to `Connection'. The old `Connection' module was moved to `Connection_'. Exported the types of the fields of `Connection' (such as `ConnectionState' and `ConnectionHandle' (previously `HandleLike').
13 years ago
import Network.Xmpp.Tls
import Network.Xmpp.Types