depdencies, core: update Tx-XMPP to be version >= 10.0:

This version changes the package name, so all `wokkel` imports habe been replaced by
`tx_xmpp`

libervia/backend/core/core_types.py

@@ -27,7 +27,7 @@ from typing_extensions import TypedDict
 from twisted.words.protocols.jabber import jid as t_jid
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 
 from libervia.backend.core import exceptions
 from libervia.backend.models.core import MessageData

libervia/backend/core/main.py

@@ -40,7 +40,7 @@ from twisted.application import app, service
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.internet import reactor
-from wokkel.xmppim import RosterItem
+from tx_xmpp.xmppim import RosterItem
 from libervia.backend import G
 from libervia.backend.core import xmpp
 from libervia.backend.core import exceptions

libervia/backend/core/patches.py

@@ -12,7 +12,7 @@ from twisted.words.protocols.jabber import (
     sasl_mechanisms,
     xmlstream,
 )
-from wokkel import client
+from tx_xmpp import client
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C

libervia/backend/core/xmpp.py

@@ -41,9 +41,9 @@ from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import client as wokkel_client, disco, generic, iwokkel, xmppim
-from wokkel import component
-from wokkel import delay
+from tx_xmpp import client as tx_xmpp_client, disco, generic, itx_xmpp, xmppim
+from tx_xmpp import component
+from tx_xmpp import delay
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -1026,8 +1026,8 @@ class SatXMPPEntity(core_types.SatXMPPEntity):
 ExtraDict = dict  # TODO
 
 
-@implementer(iwokkel.IDisco)
-class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPClient):
+@implementer(itx_xmpp.IDisco)
+class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, tx_xmpp_client.XMPPClient):
     trigger_suffix = ""
     is_component = False
 
@@ -1088,7 +1088,7 @@ class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPC
             tls_required = False
             configurationForTLS = ssl.CertificateOptions(trustRoot=None)
 
-        wokkel_client.XMPPClient.__init__(
+        tx_xmpp_client.XMPPClient.__init__(
             self,
             user_jid,
             password,
@@ -1196,7 +1196,7 @@ class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, wokkel_client.XMPPC
         d.addCallback(lambda __: super(SatXMPPClient, self)._finish_connection(__))
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class SatXMPPComponent(SatXMPPEntity, core_types.SatXMPPComponent, component.Component):
     """XMPP component
 
@@ -1437,7 +1437,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
             return MessageData()
 
         if message_elt.uri == None:
-            # xmlns may be None when wokkel element parsing strip out root namespace
+            # xmlns may be None when tx_xmpp element parsing strip out root namespace
             self.normalize_ns(message_elt, None)
         elif message_elt.uri != C.NS_CLIENT:
             log.error(
@@ -2097,8 +2097,8 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
         if statuses is None:
             statuses = {}
 
-        # default for us is None for wokkel
-        # so we must temporarily switch to wokkel's convention...
+        # default for us is None for tx_xmpp
+        # so we must temporarily switch to tx_xmpp's convention...
         if C.PRESENCE_STATUSES_DEFAULT in statuses:
             statuses[None] = statuses.pop(C.PRESENCE_STATUSES_DEFAULT)
 
@@ -2165,7 +2165,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
         self.host.bridge.subscribe("unsubscribe", entity.userhost(), self.parent.profile)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class SatDiscoProtocol(disco.DiscoClientProtocol):
 
     def __init__(self, host):
@@ -2195,7 +2195,7 @@ class SatFallbackHandler(generic.FallbackHandler):
 class SatVersionHandler(generic.VersionHandler):
 
     def getDiscoInfo(self, requestor, target, node):
-        # XXX: We need to work around wokkel's behaviour (namespace not added if there
+        # XXX: We need to work around tx_xmpp's behaviour (namespace not added if there
         #      is a node) as it cause issues with XEP-0115 & PEP (XEP-0163): there is a
         #      node when server ask for disco info, and not when we generate the key, so
         #      the hash is used with different disco features, and when the server (seen
@@ -2204,7 +2204,7 @@ class SatVersionHandler(generic.VersionHandler):
         return generic.VersionHandler.getDiscoInfo(self, requestor, target, None)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class SatIdentityHandler(XMPPHandler):
     """Manage disco Identity of SàT."""
 

libervia/backend/memory/disco.py

@@ -33,7 +33,7 @@ from twisted.python import failure
 from libervia.backend.core.constants import Const as C
 from libervia.backend.tools import xml_tools
 from libervia.backend.memory import persistent
-from wokkel import disco
+from tx_xmpp import disco
 from base64 import b64encode
 from hashlib import sha1
 
@@ -93,7 +93,7 @@ class HashManager(object):
                 element = xml_tools.ElementParser()(xml)
                 disco_info = disco.DiscoInfo.fromElement(element)
                 for ext_form in disco_info.extensions.values():
-                    # wokkel doesn't call typeCheck on reception, so we do it here
+                    # tx_xmpp doesn't call typeCheck on reception, so we do it here
                     ext_form.typeCheck()
                 if not disco_info.features and not disco_info.identities:
                     log.warning(
@@ -231,7 +231,7 @@ class Discovery(object):
             def infos_cb(disco_infos):
                 cap_hash = self.generate_hash(disco_infos)
                 for ext_form in disco_infos.extensions.values():
-                    # wokkel doesn't call typeCheck on reception, so we do it here
+                    # tx_xmpp doesn't call typeCheck on reception, so we do it here
                     # to avoid ending up with incorrect types. We have to do it after
                     # the hash has been generated (str value is needed to compute the
                     # hash)

libervia/backend/memory/sqla_mapping.py

@@ -44,7 +44,7 @@ from sqlalchemy.sql import false
 from sqlalchemy.sql.functions import now
 from sqlalchemy.types import TypeDecorator
 from twisted.words.protocols.jabber import jid
-from wokkel import generic
+from tx_xmpp import generic
 
 from libervia.backend.core.constants import Const as C
 

libervia/backend/plugins/plugin_adhoc_dbus.py

@@ -26,7 +26,7 @@ import uuid
 from twisted.internet import defer
 from twisted.internet import reactor
 from twisted.words.protocols.jabber import jid
-from wokkel import data_form
+from tx_xmpp import data_form
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.core_types import SatXMPPEntity

libervia/backend/plugins/plugin_comp_ap_gateway/__init__.py

@@ -51,7 +51,7 @@ from twisted.internet import defer, reactor, threads
 from twisted.web import http
 from twisted.words.protocols.jabber import error, jid
 from twisted.words.xish import domish
-from wokkel import pubsub, rsm
+from tx_xmpp import pubsub, rsm
 
 from libervia.backend import G
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_comp_ap_gateway/ad_hoc.py

@@ -18,7 +18,7 @@
 
 from typing import cast
 from twisted.words.protocols.jabber import jid
-from wokkel import data_form
+from tx_xmpp import data_form
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.core_types import SatXMPPEntity

libervia/backend/plugins/plugin_comp_ap_gateway/http_server.py

@@ -30,7 +30,7 @@ from twisted.web import http, resource as web_resource, server
 from twisted.web import static
 from twisted.web import util as web_util
 from twisted.words.protocols.jabber import error, jid
-from wokkel import pubsub, rsm
+from tx_xmpp import pubsub, rsm
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_comp_ap_gateway/pubsub_service.py

@@ -25,7 +25,7 @@ import tempfile
 from twisted.internet import defer, threads
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
-from wokkel import rsm, pubsub
+from tx_xmpp import rsm, pubsub
 
 from libervia.backend.core.i18n import _
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_comp_conferences/__init__.py

@@ -35,7 +35,7 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -571,7 +571,7 @@ class ConferencesComponent:
         log.error(f"Can't run Galene process: {failure_.value}")
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class ConferencesHandler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_comp_email_gateway/__init__.py

@@ -41,7 +41,7 @@ from twisted.words.protocols.jabber import error as jabber_error
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -1491,7 +1491,7 @@ class EmailGatewayComponent(GetDataHandler):
         form.addField(data_form.Field(var="sender_id", value=credentials.user_email))
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class EmailGatewayHandler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_comp_email_gateway/pubsub_service.py

@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, cast
 from twisted.internet import defer
 from twisted.words.protocols.jabber import error, jid
 from twisted.words.xish import domish
-from wokkel import data_form, disco, pubsub, rsm
+from tx_xmpp import data_form, disco, pubsub, rsm
 
 from libervia.backend import G
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_comp_file_sharing.py

@@ -45,8 +45,8 @@ from libervia.backend.models.types import JIDType
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import error, jid
 from twisted.web import server, resource, static, http
-from wokkel import pubsub
-from wokkel import generic
+from tx_xmpp import pubsub
+from tx_xmpp import generic
 
 log = getLogger(__name__)
 

libervia/backend/plugins/plugin_exp_data_policy.py

@@ -25,7 +25,7 @@ from typing import get_type_hints
 from pydantic import BaseModel, ConfigDict, Field, computed_field
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
-from wokkel import data_form
+from tx_xmpp import data_form
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_exp_gre.py

@@ -24,7 +24,7 @@ from twisted.words.protocols.jabber import jid, error as jabber_error
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -354,7 +354,7 @@ class GRE:
         return GREHandler(self)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class GREHandler(XMPPHandler):
 
     def __init__(self, plugin_parent: GRE) -> None:

libervia/backend/plugins/plugin_exp_invitation.py

@@ -21,7 +21,7 @@ from zope.interface import implementer
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from libervia.backend.core.i18n import _
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C
@@ -345,7 +345,7 @@ class Invitation(object):
                 await utils.as_deferred(cb, client, namespace, name, extra, *args)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class PubsubInvitationHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_exp_list_of_interest.py

@@ -24,7 +24,7 @@ from libervia.backend.core import exceptions
 from libervia.backend.core.log import getLogger
 from libervia.backend.tools.common import data_format
 from libervia.backend.tools.common import uri
-from wokkel import disco, iwokkel, pubsub
+from tx_xmpp import disco, itx_xmpp, pubsub
 from zope.interface import implementer
 from twisted.internet import defer
 from twisted.words.protocols.jabber import error as jabber_error, jid
@@ -333,7 +333,7 @@ class ListInterest(object):
             raise exceptions.NotFound
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class ListInterestHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_exp_pubsub_admin.py

@@ -23,8 +23,8 @@ from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
 from libervia.backend.tools.common import data_format
 from twisted.words.protocols.jabber import jid
-from wokkel import pubsub
-from wokkel import generic
+from tx_xmpp import pubsub
+from tx_xmpp import generic
 
 log = getLogger(__name__)
 

libervia/backend/plugins/plugin_misc_groupblog.py

@@ -27,13 +27,13 @@ from libervia.backend.plugins.plugin_xep_0277 import MbData
 log = getLogger(__name__)
 from twisted.internet import defer
 from libervia.backend.core import exceptions
-from wokkel import disco, data_form, iwokkel
+from tx_xmpp import disco, data_form, itx_xmpp
 from zope.interface import implementer
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 NS_PUBSUB = "http://jabber.org/protocol/pubsub"
 NS_GROUPBLOG = "http://salut-a-toi.org/protocol/groupblog"
@@ -154,7 +154,7 @@ class GroupBlog(object):
             options[self._p.OPT_ROSTER_GROUPS_ALLOWED] = mb_data["groups"]
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class GroupBlog_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_misc_ip.py

@@ -22,7 +22,7 @@ from libervia.backend.core.i18n import _, D_
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
 from libervia.backend.tools import xml_tools
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from twisted.web import client as webclient
 from twisted.web import error as web_error
 from twisted.internet import defer
@@ -318,7 +318,7 @@ class IPPlugin(object):
         return ip
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class IPPlugin_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_misc_pubsub_contacts.py

@@ -25,8 +25,8 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber.jid import JID
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco
-from wokkel.pubsub import NS_PUBSUB, NS_PUBSUB_EVENT
+from tx_xmpp import disco
+from tx_xmpp.pubsub import NS_PUBSUB, NS_PUBSUB_EVENT
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -41,7 +41,7 @@ from libervia.backend.tools.xml_tools import find_ancestor
 
 if TYPE_CHECKING:
     from libervia.backend.core.main import LiberviaBackend
-    from wokkel.pubsub import ItemsEvent
+    from tx_xmpp.pubsub import ItemsEvent
 
 log = getLogger(__name__)
 

libervia/backend/plugins/plugin_misc_remote_control.py

@@ -20,7 +20,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -373,7 +373,7 @@ class RemoteControl(BaseApplicationHandler):
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class RemoteControl_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_REMOTE_CONTROL)]

libervia/backend/plugins/plugin_misc_room_game.py

@@ -26,14 +26,14 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
 from twisted.internet import defer
 from time import time
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 import copy
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 # Don't forget to set it to False before you commit
 _DEBUG = False
@@ -137,7 +137,7 @@ class RoomGame(object):
         The game will not be created if one already exists in the room,
         also its creation could be postponed until all the expected players
         join the room (in that case it will be created from user_joined_trigger).
-        @param room (wokkel.muc.Room): the room
+        @param room (tx_xmpp.muc.Room): the room
         @param other_players (list[jid.JID]): list of the other players JID (bare)
         """
         # FIXME: broken !
@@ -213,7 +213,7 @@ class RoomGame(object):
                         break
                 else:
                     # TODO: that's not secure enough but what to do if
-                    # wokkel.muc.User's 'entity' attribute is not set?!
+                    # tx_xmpp.muc.User's 'entity' attribute is not set?!
                     if nick in [invited.user for invited in invitations[1]]:
                         auth = True
                         break
@@ -411,7 +411,7 @@ class RoomGame(object):
     def _check_wait_auth(self, room, other_players, verbose=False):
         """Check if we must wait for other players before starting the game.
 
-        @param room (wokkel.muc.Room): the room
+        @param room (tx_xmpp.muc.Room): the room
         @param other_players (list[jid.JID]): list of the players without the referee
         @param verbose (bool): display debug message
         @return: (x, y, z) with:
@@ -498,8 +498,8 @@ class RoomGame(object):
     def user_joined_trigger(self, room, user, profile):
         """This trigger is used to check if the new user can take part of a game, create the game if we were waiting for him or just update the players list.
 
-        @room: wokkel.muc.Room object. room.roster is a dict{wokkel.muc.User.nick: wokkel.muc.User}
-        @user: wokkel.muc.User object. user.nick is a unicode and user.entity a JID
+        @room: tx_xmpp.muc.Room object. room.roster is a dict{tx_xmpp.muc.User.nick: tx_xmpp.muc.User}
+        @user: tx_xmpp.muc.User object. user.nick is a unicode and user.entity a JID
         @return: True to not interrupt the main process.
         """
         room_jid = room.occupantJID.userhostJID()
@@ -537,8 +537,8 @@ class RoomGame(object):
     def user_left_trigger(self, room, user, profile):
         """This trigger is used to update or stop the game when a user leaves.
 
-        @room: wokkel.muc.Room object. room.roster is a dict{wokkel.muc.User.nick: wokkel.muc.User}
-        @user: wokkel.muc.User object. user.nick is a unicode and user.entity a JID
+        @room: tx_xmpp.muc.Room object. room.roster is a dict{tx_xmpp.muc.User.nick: tx_xmpp.muc.User}
+        @user: tx_xmpp.muc.User object. user.nick is a unicode and user.entity a JID
         @return: True to not interrupt the main process.
         """
         room_jid = room.occupantJID.userhostJID()
@@ -767,7 +767,7 @@ class RoomGame(object):
         return RoomGameHandler(self)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class RoomGameHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_misc_tarot.py

@@ -25,7 +25,7 @@ log = getLogger(__name__)
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
 from twisted.internet import defer
-from wokkel import data_form
+from tx_xmpp import data_form
 
 from libervia.backend.memory import memory
 from libervia.backend.tools import xml_tools

libervia/backend/plugins/plugin_pubsub_cache.py

@@ -22,7 +22,7 @@ from typing import Optional, List, Tuple, Dict, Any, cast
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
 from twisted.internet import defer
-from wokkel import pubsub, rsm
+from tx_xmpp import pubsub, rsm
 from libervia.backend import G
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_sec_gre_encrypter_openpgp.py

@@ -22,7 +22,7 @@ from typing import Final, TYPE_CHECKING, cast
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -87,7 +87,7 @@ class GREEncrypterOpenPGP(Encrypter):
         return base64.b64encode(encrypted_data).decode("ASCII")
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class GREMIMEHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_sec_gre_formatter_mime.py

@@ -21,7 +21,7 @@ from typing import Final, TYPE_CHECKING, cast
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -108,7 +108,7 @@ class GREFormatterMime(Formatter):
         return msg.as_bytes()
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class GREMIMEHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0004.py

@@ -23,7 +23,7 @@ from pydantic import BaseModel, Field
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco
+from tx_xmpp import data_form, disco
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -172,7 +172,7 @@ class DataForm(BaseModel):
         raise KeyError(f"Field '{field_var}' not found in data form")
 
     @classmethod
-    def from_wokkel_form(
+    def from_tx_xmpp_form(
         cls, form: data_form.Form, source_form: Self | None = None
     ) -> Self:
         """Convert Wokkel Form to DataForm.
@@ -277,7 +277,7 @@ class DataForm(BaseModel):
             fields=fields,
         )
 
-    def to_wokkel_form(self) -> data_form.Form:
+    def to_tx_xmpp_form(self) -> data_form.Form:
         """Convert DataForm to Wokkel Form."""
         form = data_form.Form(
             formType=self.type,
@@ -315,7 +315,7 @@ class DataForm(BaseModel):
         descendant.
         @param element: Element to parse, it must be a data form, or have a child which is
             a data form.
-        @param source_form: Original form for submitted forms. See [from_wokkel_form].
+        @param source_form: Original form for submitted forms. See [from_tx_xmpp_form].
         @return: Instance of DataForm.
         @raise exceptions.NotFound: No data form found in ``element`` or one of its
             descendants.
@@ -328,11 +328,11 @@ class DataForm(BaseModel):
                     f"No data form found in {element} or its descendants."
                 )
         form = data_form.Form.fromElement(element)
-        return cls.from_wokkel_form(form, source_form=source_form)
+        return cls.from_tx_xmpp_form(form, source_form=source_form)
 
     def to_element(self) -> domish.Element:
         """Generate the <x> element corresponding to this form."""
-        return self.to_wokkel_form().toElement()
+        return self.to_tx_xmpp_form().toElement()
 
 
 class XEP_0004:

libervia/backend/plugins/plugin_xep_0020.py

@@ -30,9 +30,9 @@ from zope.interface import implementer
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
-from wokkel import disco, iwokkel, data_form
+from tx_xmpp import disco, itx_xmpp, data_form
 
 NS_FEATURE_NEG = "http://jabber.org/protocol/feature-neg"
 
@@ -156,7 +156,7 @@ class XEP_0020(object):
         return feature_elt
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0020_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0033.py

@@ -24,7 +24,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -519,7 +519,7 @@ class XEP_0033:
         return XEP_0033_handler()
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0033_handler(XMPPHandler):
 
     def getDiscoInfo(

libervia/backend/plugins/plugin_xep_0045.py

@@ -28,9 +28,9 @@ from twisted.internet import defer
 from twisted.python import failure
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber import error as xmpp_error
-from wokkel import disco, iwokkel, muc
-from wokkel import rsm
-from wokkel import mam
+from tx_xmpp import disco, itx_xmpp, muc
+from tx_xmpp import rsm
+from tx_xmpp import mam
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -1105,7 +1105,7 @@ class XEP_0045:
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class LiberviaMUCClient(muc.MUCClient):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0047.py

@@ -30,7 +30,7 @@ from twisted.internet import reactor
 from twisted.internet import defer
 from twisted.python import failure
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from zope.interface import implementer
 
@@ -39,7 +39,7 @@ import base64
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 MESSAGE = "/message"
 IQ_SET = '/iq[@type="set"]'
@@ -373,7 +373,7 @@ class XEP_0047(object):
         self._kill_session(session_data["id"], client, failure_reason)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0047_handler(XMPPHandler):
 
     def __init__(self, parent):

libervia/backend/plugins/plugin_xep_0049.py

@@ -22,7 +22,7 @@ from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
 
 log = getLogger(__name__)
-from wokkel import compat
+from tx_xmpp import compat
 from twisted.words.xish import domish
 
 PLUGIN_INFO = {

libervia/backend/plugins/plugin_xep_0050.py

@@ -29,7 +29,7 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -334,7 +334,7 @@ class AdHocCommand(BaseModel):
             raise ValueError('"str" or "Callable are expected for "callback".')
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class AdHocCommandHandler(XMPPHandler):
     """Implementation of an Ad-Hoc Command handler for XMPP.
 
@@ -1212,7 +1212,7 @@ class XEP_0050:
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0050_handler(XMPPHandler):
     def __init__(self, plugin_parent):
         self.plugin_parent = plugin_parent

libervia/backend/plugins/plugin_xep_0054.py

@@ -27,7 +27,7 @@ from twisted.internet import threads, defer
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
 from twisted.python.failure import Failure
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from libervia.backend.core import exceptions
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C
@@ -370,7 +370,7 @@ class XEP_0054(object):
         await iq_elt.send()
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0054_handler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0055.py

@@ -29,12 +29,12 @@ log = getLogger(__name__)
 from twisted.words.protocols.jabber.xmlstream import IQ, XMPPHandler
 from twisted.words.protocols.jabber import jid
 from twisted.internet import defer
-from wokkel import data_form
+from tx_xmpp import data_form
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.exceptions import DataError
 from libervia.backend.tools import xml_tools
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from zope.interface import implementer
 
@@ -297,7 +297,7 @@ class XEP_0055:
         xml_tools.data_form_2_widgets(main_ui, data_form.Form.fromElement(form_elt))
 
         # refill the submitted values
-        # FIXME: wokkel's data_form.Form.fromElement doesn't parse the values, so we do it directly in XMLUI for now
+        # FIXME: tx_xmpp's data_form.Form.fromElement doesn't parse the values, so we do it directly in XMLUI for now
         for widget in main_ui.current_container.elem.childNodes:
             name = widget.getAttribute("name")
             if adv_data.get(name):
@@ -519,7 +519,7 @@ class XEP_0055:
         raise failure
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0055_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0059.py

@@ -22,7 +22,7 @@ from pydantic import BaseModel, Field, field_validator
 from zope.interface import implementer
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel, rsm
+from tx_xmpp import disco, itx_xmpp, rsm
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
@@ -65,20 +65,20 @@ class RSMRequest(BaseModel):
             raise ValueError('RSM "after" can\'t be empty')
         return v
 
-    def to_wokkel_request(self) -> rsm.RSMRequest:
-        """Convert to wokkel RSMRequest
+    def to_tx_xmpp_request(self) -> rsm.RSMRequest:
+        """Convert to tx_xmpp RSMRequest
 
-        @return: wokkel RSMRequest instance
+        @return: tx_xmpp RSMRequest instance
         """
         return rsm.RSMRequest(
             max_=self.max, after=self.after, before=self.before, index=self.index
         )
 
     @classmethod
-    def from_wokkel_request(cls, request: rsm.RSMRequest) -> Self:
-        """Create from wokkel RSMRequest
+    def from_tx_xmpp_request(cls, request: rsm.RSMRequest) -> Self:
+        """Create from tx_xmpp RSMRequest
 
-        @param request: wokkel RSMRequest to convert
+        @param request: tx_xmpp RSMRequest to convert
         @return: RSMRequestModel instance
         """
         return cls(
@@ -93,7 +93,7 @@ class RSMRequest(BaseModel):
 
         @return: XML element representing the RSM request
         """
-        return self.to_wokkel_request().toElement()
+        return self.to_tx_xmpp_request().toElement()
 
     @classmethod
     def from_element(cls, element: domish.Element) -> Self:
@@ -104,12 +104,12 @@ class RSMRequest(BaseModel):
         @raise ValueError: if the element is invalid
         """
         try:
-            wokkel_req = rsm.RSMRequest.fromElement(element)
+            tx_xmpp_req = rsm.RSMRequest.fromElement(element)
         except rsm.RSMNotFoundError:
             raise ValueError("No RSM set element found")
         except rsm.RSMError as e:
             raise ValueError(str(e))
-        return cls.from_wokkel_request(wokkel_req)
+        return cls.from_tx_xmpp_request(tx_xmpp_req)
 
 
 class RSMResponse(BaseModel):
@@ -120,20 +120,20 @@ class RSMResponse(BaseModel):
     index: int | None = None
     count: int | None = None
 
-    def to_wokkel_response(self) -> rsm.RSMResponse:
-        """Convert to wokkel RSMResponse
+    def to_tx_xmpp_response(self) -> rsm.RSMResponse:
+        """Convert to tx_xmpp RSMResponse
 
-        @return: wokkel RSMResponse instance
+        @return: tx_xmpp RSMResponse instance
         """
         return rsm.RSMResponse(
             first=self.first, last=self.last, index=self.index, count=self.count
         )
 
     @classmethod
-    def from_wokkel_response(cls, response: rsm.RSMResponse) -> Self:
-        """Create from wokkel RSMResponse
+    def from_tx_xmpp_response(cls, response: rsm.RSMResponse) -> Self:
+        """Create from tx_xmpp RSMResponse
 
-        @param response: wokkel RSMResponse to convert
+        @param response: tx_xmpp RSMResponse to convert
         @return: RSMResponseModel instance
         """
         return cls(
@@ -148,7 +148,7 @@ class RSMResponse(BaseModel):
 
         @return: XML element representing the RSM response
         """
-        return self.to_wokkel_response().toElement()
+        return self.to_tx_xmpp_response().toElement()
 
     @classmethod
     def from_element(cls, element: domish.Element) -> Self:
@@ -159,12 +159,12 @@ class RSMResponse(BaseModel):
         @raise ValueError: if the element is invalid
         """
         try:
-            wokkel_resp = rsm.RSMResponse.fromElement(element)
+            tx_xmpp_resp = rsm.RSMResponse.fromElement(element)
         except rsm.RSMNotFoundError:
             raise ValueError("No RSM set element found")
         except rsm.RSMError as e:
             raise ValueError(str(e))
-        return cls.from_wokkel_response(wokkel_resp)
+        return cls.from_tx_xmpp_response(tx_xmpp_resp)
 
 
 class XEP_0059:
@@ -200,7 +200,7 @@ class XEP_0059:
             except KeyError:
                 continue
 
-        return RSMRequest(**rsm_args).to_wokkel_request() if rsm_args else None
+        return RSMRequest(**rsm_args).to_tx_xmpp_request() if rsm_args else None
 
     def response2dict(
         self, rsm_response: rsm.RSMResponse, data: dict[str, str] | None = None
@@ -223,7 +223,7 @@ class XEP_0059:
         #   XEP-0313 plugin.
         if data is None:
             data = {}
-        model = RSMResponse.from_wokkel_response(rsm_response)
+        model = RSMResponse.from_tx_xmpp_response(rsm_response)
 
         if model.first is not None:
             data["first"] = model.first
@@ -276,7 +276,7 @@ class XEP_0059:
         return RSMRequest(max=rsm_request.max, after=rsm_response.last)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0059_handler(xmlstream.XMPPHandler):
     def getDiscoInfo(
         self, requestor: str, target: str, nodeIdentifier: str = ""

libervia/backend/plugins/plugin_xep_0060.py

@@ -39,11 +39,11 @@ from pydantic import BaseModel, ConfigDict, Field
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import error, jid
 from twisted.words.xish import domish
-from wokkel import disco
-from wokkel import data_form
-from wokkel import pubsub
-from wokkel import rsm
-from wokkel import mam
+from tx_xmpp import disco
+from tx_xmpp import data_form
+from tx_xmpp import pubsub
+from tx_xmpp import rsm
+from tx_xmpp import mam
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -995,17 +995,17 @@ class XEP_0060:
                 - service, node: service and node used
         """
         if rsm_request is not None:
-            # For the moment we convert RSMRequest to wokkel rsm.RSMRequest for backward
+            # For the moment we convert RSMRequest to tx_xmpp rsm.RSMRequest for backward
             # compatibility with other plugins. In the future we should work as much as
             # possible with XEP-0059's plugin RSMRequest, and convert to Wokkel
-            # rsm.RSMRequest only when we need to work with wokkel directly.
+            # rsm.RSMRequest only when we need to work with tx_xmpp directly.
             if isinstance(rsm_request, rsm.RSMRequest):
                 log.warning(
                     "Use of rsm.RSMRequest is deprecated, use plugin_xep_0059.RSMRequest "
                     "instead."
                 )
             else:
-                rsm_request = rsm_request.to_wokkel_request()
+                rsm_request = rsm_request.to_tx_xmpp_request()
         if item_ids and max_items is not None:
             max_items = None
         if rsm_request and item_ids:

libervia/backend/plugins/plugin_xep_0065.py

@@ -66,7 +66,7 @@ from twisted.words.protocols.jabber import error as jabber_error
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber import xmlstream
 from twisted.internet import defer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from libervia.backend.core.i18n import _
 from libervia.backend.core.log import getLogger
 from libervia.backend.core.constants import Const as C
@@ -1396,7 +1396,7 @@ class XEP_0065(object):
         client.send(result_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0065_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0070.py

@@ -25,13 +25,13 @@ from twisted.words.protocols import jabber
 log = getLogger(__name__)
 from libervia.backend.tools import xml_tools
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 
 NS_HTTP_AUTH = "http://jabber.org/protocol/http-auth"
@@ -132,7 +132,7 @@ class XEP_0070(object):
             client.send(result_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0070_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0071.py

@@ -26,7 +26,7 @@ log = getLogger(__name__)
 from libervia.backend.tools.common import data_format
 
 from twisted.internet import defer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 # from lxml import etree
@@ -39,7 +39,7 @@ except ImportError:
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 NS_XHTML_IM = "http://jabber.org/protocol/xhtml-im"
 NS_XHTML = "http://www.w3.org/1999/xhtml"
@@ -295,7 +295,7 @@ class XEP_0071(object):
         return html.tostring(root_elt, encoding="unicode", method="xml")
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0071_handler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0077.py

@@ -29,7 +29,7 @@ from twisted.words.protocols.jabber import (
     xmlstream as xmlstream_mod,
 )
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -536,7 +536,7 @@ class XEP_0077:
         return d
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0077_handler(xmlstream_mod.XMPPHandler):
 
     def __init__(self, plugin_parent: XEP_0077) -> None:

libervia/backend/plugins/plugin_xep_0084.py

@@ -25,7 +25,7 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
 from zope.interface import implementer
-from wokkel import disco, iwokkel, pubsub
+from tx_xmpp import disco, itx_xmpp, pubsub
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.i18n import _
@@ -232,7 +232,7 @@ class XEP_0084:
         await self._p.send_items(client, service, NS_AVATAR_METADATA, [item_metadata_elt])
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0084_Handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0085.py

@@ -23,7 +23,7 @@ from libervia.backend.core import exceptions
 from libervia.backend.core.log import getLogger
 
 log = getLogger(__name__)
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 from twisted.words.protocols.jabber.jid import JID
 
@@ -416,7 +416,7 @@ class ChatStateMachine(object):
             )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0085_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0092.py

@@ -21,7 +21,7 @@ from typing import Tuple
 
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import jid
-from wokkel import compat
+from tx_xmpp import compat
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_xep_0095.py

@@ -26,8 +26,8 @@ from libervia.backend.core import exceptions
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber import error
 from zope.interface import implementer
-from wokkel import disco
-from wokkel import iwokkel
+from tx_xmpp import disco
+from tx_xmpp import itx_xmpp
 import uuid
 
 PLUGIN_INFO = {
@@ -181,7 +181,7 @@ class XEP_0095(object):
         return sid, offer_d
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0095_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0100.py

@@ -21,7 +21,7 @@ from typing import cast
 from pydantic import BaseModel, Field
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import jid
-from wokkel import disco
+from tx_xmpp import disco
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_xep_0106.py

@@ -22,7 +22,7 @@ from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
 from twisted.words.protocols.jabber import xmlstream
 from zope.interface import implementer
-from wokkel import disco
+from tx_xmpp import disco
 
 log = getLogger(__name__)
 

libervia/backend/plugins/plugin_xep_0115.py

@@ -26,12 +26,12 @@ from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
 from twisted.internet import defer, error
 from zope.interface import implementer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 PRESENCE = "/presence"
 NS_ENTITY_CAPABILITY = "http://jabber.org/protocol/caps"
@@ -115,7 +115,7 @@ class XEP_0115(object):
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0115_handler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0131.py

@@ -25,7 +25,7 @@ from pydantic import BaseModel, ConfigDict, Field, RootModel
 from twisted.internet import defer
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0163.py

@@ -28,8 +28,8 @@ from libervia.backend.core.log import getLogger
 
 from twisted.words.xish import domish
 
-from wokkel import disco, pubsub
-from wokkel.formats import Mood
+from tx_xmpp import disco, pubsub
+from tx_xmpp.formats import Mood
 from libervia.backend.tools.common import data_format
 from libervia.backend.tools import utils
 
@@ -201,7 +201,7 @@ class XEP_0163(object):
 
 
 class UserMood(Mood, domish.Element):
-    """Improved wokkel Mood which is also a domish.Element"""
+    """Improved tx_xmpp Mood which is also a domish.Element"""
 
     def __init__(self, value, text=None):
         Mood.__init__(self, value, text)

libervia/backend/plugins/plugin_xep_0166/__init__.py

@@ -28,7 +28,7 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -1573,7 +1573,7 @@ class XEP_0166:
                 )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0166_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0167/__init__.py

@@ -23,7 +23,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -802,7 +802,7 @@ class XEP_0167(BaseApplicationHandler):
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0167_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [

libervia/backend/plugins/plugin_xep_0176.py

@@ -22,7 +22,7 @@ import uuid
 from twisted.internet import defer
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -487,7 +487,7 @@ class XEP_0176(BaseTransportHandler):
                 log.warning(f"Could not send new ICE candidates: {e}")
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0176_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_ICE_UDP)]

libervia/backend/plugins/plugin_xep_0184.py

@@ -25,13 +25,13 @@ from twisted.words.xish import domish
 
 log = getLogger(__name__)
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 
 NS_MESSAGE_DELIVERY_RECEIPTS = "urn:xmpp:receipts"
@@ -199,7 +199,7 @@ class XEP_0184(object):
         return self.host.memory.param_get_a(PARAM_NAME, PARAM_KEY, profile_key=profile)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0184_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0191.py

@@ -22,7 +22,7 @@ from twisted.words.protocols.jabber import xmlstream, jid
 from twisted.words.xish import domish
 from twisted.internet import defer
 from zope.interface import implementer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.i18n import _
@@ -171,7 +171,7 @@ class XEP_0191:
         client.send(iq_result_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0191_Handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent: XEP_0191):

libervia/backend/plugins/plugin_xep_0198.py

@@ -27,7 +27,7 @@ from twisted.words.xish import domish
 from twisted.internet import defer
 from twisted.internet import task, reactor
 from functools import partial
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 import collections
 import time
@@ -561,7 +561,7 @@ class XEP_0198(object):
         client._xep_0198_session.req_timer = None
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0198_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0199.py

@@ -23,7 +23,7 @@ from libervia.backend.core.log import getLogger
 
 log = getLogger(__name__)
 from libervia.backend.core.constants import Const as C
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from twisted.words.protocols.jabber import xmlstream, jid
 from zope.interface import implementer
 import time
@@ -150,7 +150,7 @@ class XEP_0199(object):
         client.send(iq_result_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0199_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0203.py

@@ -24,12 +24,12 @@ from libervia.backend.core.log import getLogger
 
 log = getLogger(__name__)
 
-from wokkel import disco, iwokkel, delay
+from tx_xmpp import disco, itx_xmpp, delay
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 from zope.interface import implementer
 
 NS_DD = "urn:xmpp:delay"
@@ -70,7 +70,7 @@ class XEP_0203(object):
         return elt
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0203_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0215.py

@@ -22,7 +22,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import error, jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import data_form, disco, iwokkel
+from tx_xmpp import data_form, disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -311,7 +311,7 @@ class XEP_0215:
                 log.warning(f"unknown action for services push, ignoring: {action!r}")
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0215_handler(XMPPHandler):
     def __init__(self, plugin_parent):
         self.plugin_parent = plugin_parent

libervia/backend/plugins/plugin_xep_0231.py

@@ -27,7 +27,7 @@ from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber import error as jabber_error
 from twisted.internet import defer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from libervia.backend.tools import xml_tools
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C
@@ -231,7 +231,7 @@ class XEP_0231(object):
             return self.request_data(client, peer_jid, cid)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0231_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0234.py

@@ -27,7 +27,7 @@ from twisted.python import failure
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -1110,7 +1110,7 @@ class XEP_0234(BaseApplicationHandler):
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0234_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0249.py

@@ -20,7 +20,7 @@
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -36,7 +36,7 @@ log = getLogger(__name__)
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 MESSAGE = "/message"
 NS_X_CONFERENCE = "jabber:x:conference"
@@ -245,7 +245,7 @@ class XEP_0249:
         return False
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0249_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0260.py

@@ -24,7 +24,7 @@ from libervia.backend.plugins.plugin_xep_0166.models import BaseTransportHandler
 
 log = getLogger(__name__)
 from libervia.backend.core import exceptions
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
@@ -34,7 +34,7 @@ import uuid
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 
 NS_JINGLE_S5B = "urn:xmpp:jingle:transports:s5b:1"
@@ -545,7 +545,7 @@ class XEP_0260(BaseTransportHandler):
         return d
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0260_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0261.py

@@ -23,7 +23,7 @@ from libervia.backend.core.log import getLogger
 from libervia.backend.plugins.plugin_xep_0166.models import BaseTransportHandler
 
 log = getLogger(__name__)
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 from twisted.words.xish import domish
 import uuid
@@ -31,7 +31,7 @@ import uuid
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 
 NS_JINGLE_IBB = "urn:xmpp:jingle:transports:ibb:1"
@@ -105,7 +105,7 @@ class XEP_0261(BaseTransportHandler):
         return transport_elt
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0261_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0264.py

@@ -28,7 +28,7 @@ from twisted.internet import defer, threads
 
 from zope.interface import implementer
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from libervia.backend.core import exceptions
 import hashlib
@@ -206,7 +206,7 @@ class XEP_0264(object):
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0264_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0272.py

@@ -19,8 +19,8 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
-from wokkel import muc
+from tx_xmpp import disco, itx_xmpp
+from tx_xmpp import muc
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -310,7 +310,7 @@ class XEP_0272:
         return {"room_jid": room_jid.full()}
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0272_handler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0277.py

@@ -34,8 +34,8 @@ from twisted.words.xish import domish
 from twisted.internet import defer
 from twisted.python import failure
 
-from wokkel import pubsub
-from wokkel import disco, iwokkel, rsm
+from tx_xmpp import pubsub
+from tx_xmpp import disco, itx_xmpp, rsm
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -2085,7 +2085,7 @@ class XEP_0277:
         return self.rt_sessions.new_session(deferreds, client.profile)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0277_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0280.py

@@ -25,13 +25,13 @@ from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.internet import defer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
-    from wokkel.subprotocols import XMPPHandler
+    from tx_xmpp.subprotocols import XMPPHandler
 
 
 PARAM_CATEGORY = "Misc"
@@ -172,7 +172,7 @@ class XEP_0280(object):
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0280_handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0292.py

@@ -23,7 +23,7 @@ from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
 from zope.interface import implementer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.i18n import _
@@ -229,7 +229,7 @@ class XEP_0292:
         await self.update_v_card(client, {field: value}, entity)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0292_Handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0293.py

@@ -20,7 +20,7 @@ from typing import List
 
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C
@@ -303,7 +303,7 @@ class XEP_0293:
         self.build_rtcp_fb_elements(desc_elt, media_data)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0293_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_RTP_RTCP_FB)]

libervia/backend/plugins/plugin_xep_0294.py

@@ -20,7 +20,7 @@ from typing import Dict, List, Optional, Union
 
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -244,7 +244,7 @@ class XEP_0294:
             desc_elt.addElement((NS_JINGLE_RTP_HDREXT, "extmap-allow-mixed"))
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0294_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_RTP_HDREXT)]

libervia/backend/plugins/plugin_xep_0297.py

@@ -26,7 +26,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend import G
@@ -186,7 +186,7 @@ class XEP_0297:
         )
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0297_handler(XMPPHandler):
 
     def __init__(self, plugin_parent, profile):

libervia/backend/plugins/plugin_xep_0298.py

@@ -24,7 +24,7 @@ from libervia.backend.core.core_types import SatXMPPEntity
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.log import getLogger
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 
@@ -179,7 +179,7 @@ class XEP_0298:
         return {"info": {"users": users}}
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class CoinHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0300.py

@@ -28,7 +28,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -288,7 +288,7 @@ class XEP_0300:
         return best_algo, best_value
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0300_handler(XMPPHandler):
 
     def getDiscoInfo(

libervia/backend/plugins/plugin_xep_0308.py

@@ -23,7 +23,7 @@ from twisted.internet import defer
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0313.py

@@ -25,10 +25,10 @@ from dateutil import tz
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.error import StanzaError
-from wokkel import disco
-from wokkel import data_form
-from wokkel import rsm
-from wokkel import mam
+from tx_xmpp import disco
+from tx_xmpp import data_form
+from tx_xmpp import rsm
+from tx_xmpp import mam
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0320.py

@@ -18,7 +18,7 @@
 
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C
@@ -95,7 +95,7 @@ class XEP_0320:
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0320_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_DTLS)]

libervia/backend/plugins/plugin_xep_0329.py

@@ -27,7 +27,7 @@ from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber import error as jabber_error
 from twisted.internet import defer
-from wokkel import disco, iwokkel, data_form
+from tx_xmpp import disco, itx_xmpp, data_form
 from libervia.backend import G
 from libervia.backend.core.i18n import _
 from libervia.backend.core.xmpp import SatXMPPEntity
@@ -1272,7 +1272,7 @@ class XEP_0329(object):
         self.host.bridge.fis_shared_path_removed(path, client.profile)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0329_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0334.py

@@ -27,7 +27,7 @@ from libervia.backend.core.constants import Const as C
 
 from libervia.backend.tools.common import data_format
 
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
@@ -133,7 +133,7 @@ class XEP_0334(object):
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0334_handler(xmlstream.XMPPHandler):
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0338.py

@@ -20,7 +20,7 @@ from typing import List
 
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C
@@ -152,7 +152,7 @@ class XEP_0338:
                 self.add_group_element(jingle_elt, session)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0338_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_RFC_5888)]

libervia/backend/plugins/plugin_xep_0339.py

@@ -20,7 +20,7 @@ from typing import List
 
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -187,7 +187,7 @@ class XEP_0339:
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0339_handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_RTP_SSMA)]

libervia/backend/plugins/plugin_xep_0343.py

@@ -22,7 +22,7 @@ from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -334,7 +334,7 @@ class XEP_0343(BaseTransportHandler):
         return transport_elt
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP0343Handler(XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_WEBRTC_DATACHANNELS)]

libervia/backend/plugins/plugin_xep_0346.py

@@ -24,9 +24,9 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
 from twisted.internet import defer
-from wokkel import disco, iwokkel
-from wokkel import data_form
-from wokkel import generic
+from tx_xmpp import disco, itx_xmpp
+from tx_xmpp import data_form
+from tx_xmpp import generic
 from libervia.backend.core.i18n import _
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C
@@ -819,7 +819,7 @@ class PubsubSchema(object):
         return item_id
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class SchemaHandler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0353.py

@@ -23,7 +23,7 @@ from twisted.words.protocols.jabber import error, jid
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
 from libervia.backend.plugins.plugin_xep_0166.models import ApplicationData
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -480,7 +480,7 @@ class XEP_0353:
         return False
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class Handler(xmlstream.XMPPHandler):
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JINGLE_MESSAGE)]

libervia/backend/plugins/plugin_xep_0358.py

@@ -22,7 +22,7 @@ from pydantic import BaseModel, Field
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -185,7 +185,7 @@ class XEP_0358:
         return JinglePubHandler(self)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class JinglePubHandler(XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0359.py

@@ -22,7 +22,7 @@ import uuid
 
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0363.py

@@ -29,7 +29,7 @@ from twisted.web import client as http_client
 from twisted.web import http_headers
 from twisted.words.protocols.jabber import error, jid, xmlstream
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions
@@ -461,7 +461,7 @@ class XEP_0363:
         client.send(iq_result_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0363_handler(xmlstream.XMPPHandler):
 
     def __init__(self, plugin_parent):

libervia/backend/plugins/plugin_xep_0372.py

@@ -26,7 +26,7 @@ from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
 from twisted.words.xish import domish
 from zope.interface import implementer
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core.i18n import _
@@ -206,7 +206,7 @@ class XEP_0372:
         client.send(message_elt)
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0372_Handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0373/__init__.py

@@ -42,8 +42,8 @@ from libervia.backend.tools.xmpp_datetime import format_datetime, parse_datetime
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
-from wokkel import muc, pubsub
-from wokkel.disco import DiscoFeature, DiscoInfo
+from tx_xmpp import muc, pubsub
+from tx_xmpp.disco import DiscoFeature, DiscoInfo
 import xmlschema
 
 from .exceptions import VerificationError, XMPPInteractionFailed

libervia/backend/plugins/plugin_xep_0374.py

@@ -19,7 +19,7 @@
 from typing import Dict, Optional, Set, cast
 
 from typing_extensions import Final
-from wokkel import muc  # type: ignore[import]
+from tx_xmpp import muc  # type: ignore[import]
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_xep_0376.py

@@ -20,7 +20,7 @@ from typing import Dict, List, Tuple, Optional, Any
 from zope.interface import implementer
 from twisted.words.protocols.jabber import jid
 from twisted.words.protocols.jabber.xmlstream import XMPPHandler
-from wokkel import disco, iwokkel, pubsub, data_form
+from tx_xmpp import disco, itx_xmpp, pubsub, data_form
 from libervia.backend.core.i18n import _
 from libervia.backend.core.constants import Const as C
 from libervia.backend.core import exceptions
@@ -183,7 +183,7 @@ class XEP_0376:
         return False, subs
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class XEP_0376_Handler(XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0384.py

@@ -40,7 +40,7 @@ import xml.etree.ElementTree as ET
 from xml.sax.saxutils import quoteattr
 
 from typing_extensions import Final, Never, assert_never
-from wokkel import muc, pubsub  # type: ignore[import]
+from tx_xmpp import muc, pubsub  # type: ignore[import]
 import xmlschema
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0391.py

@@ -23,7 +23,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 from twisted.words.protocols.jabber import error, jid, xmlstream
 from twisted.words.xish import domish
-from wokkel import disco, iwokkel
+from tx_xmpp import disco, itx_xmpp
 from zope.interface import implementer
 from cryptography.exceptions import AlreadyFinalized
 from cryptography.hazmat import backends
@@ -276,7 +276,7 @@ class JET:
         return True
 
 
-@implementer(iwokkel.IDisco)
+@implementer(itx_xmpp.IDisco)
 class JET_Handler(xmlstream.XMPPHandler):
 
     def getDiscoInfo(self, requestor, service, nodeIdentifier=""):

libervia/backend/plugins/plugin_xep_0402.py

@@ -22,7 +22,7 @@ from pydantic import BaseModel, Field, RootModel
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from twisted.words.xish import domish
-from wokkel import pubsub
+from tx_xmpp import pubsub
 
 from libervia.backend.core import exceptions
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_xep_0422.py

@@ -20,7 +20,7 @@ from collections import namedtuple
 
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C

libervia/backend/plugins/plugin_xep_0424.py

@@ -22,7 +22,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid, xmlstream
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core import exceptions

libervia/backend/plugins/plugin_xep_0428.py

@@ -19,7 +19,7 @@ from typing import Optional
 
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.xish import domish
-from wokkel import disco
+from tx_xmpp import disco
 from zope.interface import implementer
 
 from libervia.backend.core.constants import Const as C