Compare commits
5 Commits
d4416c8a47
...
76a9f7be7a
Author | SHA1 | Date | |
---|---|---|---|
76a9f7be7a | |||
afa3927720 | |||
5f36289f50 | |||
fbe3b90200 | |||
d7c13abde6 |
@ -38,6 +38,7 @@ void main(List<String> args) async {
|
||||
DiscoManager([]),
|
||||
PubSubManager(),
|
||||
MessageManager(),
|
||||
StableIdManager(),
|
||||
MUCManager(),
|
||||
]);
|
||||
await connection.registerFeatureNegotiators([
|
||||
@ -57,8 +58,28 @@ void main(List<String> args) async {
|
||||
}
|
||||
Logger.root.info('Connected.');
|
||||
|
||||
// Print received messages.
|
||||
connection
|
||||
.asBroadcastStream()
|
||||
.where((event) => event is MessageEvent)
|
||||
.listen((event) {
|
||||
event as MessageEvent;
|
||||
|
||||
// Ignore messages with no <body />
|
||||
final body = event.get<MessageBodyData>()?.body;
|
||||
if (body == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
print('=====> [${event.from}] $body');
|
||||
});
|
||||
|
||||
// Join room
|
||||
await connection.getManagerById<MUCManager>(mucManager)!.joinRoom(muc, nick);
|
||||
await connection.getManagerById<MUCManager>(mucManager)!.joinRoom(
|
||||
muc,
|
||||
nick,
|
||||
maxHistoryStanzas: 0,
|
||||
);
|
||||
|
||||
final repl = Repl(prompt: '> ');
|
||||
await for (final line in repl.runAsync()) {
|
||||
@ -68,6 +89,11 @@ void main(List<String> args) async {
|
||||
muc,
|
||||
TypedMap<StanzaHandlerExtension>.fromList([
|
||||
MessageBodyData(line),
|
||||
StableIdData(
|
||||
// NOTE: Don't do this. Use a UUID.
|
||||
DateTime.now().millisecondsSinceEpoch.toString(),
|
||||
null,
|
||||
),
|
||||
]),
|
||||
type: 'groupchat');
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ description: A collection of samples for moxxmpp.
|
||||
version: 1.0.0
|
||||
|
||||
environment:
|
||||
sdk: '>=2.18.0 <3.0.0'
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
|
||||
dependencies:
|
||||
args: 2.4.1
|
||||
|
54
flake.lock
54
flake.lock
@ -7,11 +7,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689798050,
|
||||
"narHash": "sha256-ZyFPra7N0MF803o55dYQQyX9b/BmXr6QTCyN7slRThY=",
|
||||
"lastModified": 1694377165,
|
||||
"narHash": "sha256-NeIlZIElbkbKaNK5SZv6ULcFT/UGIICb3q7GPpkf9jk=",
|
||||
"owner": "tadfisher",
|
||||
"repo": "android-nixpkgs",
|
||||
"rev": "9aa0e2990da86de8ca203af313668851dcb9ea6e",
|
||||
"rev": "b020dc733ee69393841a50cf94d45735d5a5a57a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -29,11 +29,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1688380630,
|
||||
"narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=",
|
||||
"lastModified": 1693833206,
|
||||
"narHash": "sha256-wHOY0nnD6gWj8u9uI85/YlsganYyWRK1hLFZulZwfmY=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205",
|
||||
"rev": "65114ea495a8d3cc1352368bf170d67ef005aa5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -47,11 +47,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1689068808,
|
||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||
"lastModified": 1692799911,
|
||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -61,12 +61,15 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1692799911,
|
||||
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -77,11 +80,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1689679375,
|
||||
"narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=",
|
||||
"lastModified": 1694183432,
|
||||
"narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "684c17c429c42515bafb3ad775d2a710947f3d67",
|
||||
"rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -93,11 +96,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689752456,
|
||||
"narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
|
||||
"lastModified": 1694343207,
|
||||
"narHash": "sha256-jWi7OwFxU5Owi4k2JmiL1sa/OuBCQtpaAesuj5LXC8w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
|
||||
"rev": "78058d810644f5ed276804ce7ea9e82d92bee293",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -143,6 +146,21 @@
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
@ -68,7 +68,7 @@
|
||||
};
|
||||
in pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
flutter37 pinnedJDK sdk dart # Dart
|
||||
flutter pinnedJDK sdk dart # Dart
|
||||
gitlint # Code hygiene
|
||||
ripgrep # General utilities
|
||||
|
||||
|
@ -475,7 +475,7 @@ class XmppConnection {
|
||||
false,
|
||||
false,
|
||||
newStanza,
|
||||
TypedMap(),
|
||||
details.extensions ?? TypedMap(),
|
||||
encrypted: details.encrypted,
|
||||
shouldEncrypt: details.shouldEncrypt,
|
||||
forceEncryption: details.forceEncryption,
|
||||
|
@ -66,7 +66,7 @@ class MessageManager extends XmppManagerBase {
|
||||
stanzaTag: 'message',
|
||||
callback: _onMessage,
|
||||
priority: messageHandlerPriority,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -117,6 +117,7 @@ class MessageManager extends XmppManagerBase {
|
||||
.flattened
|
||||
.toList(),
|
||||
),
|
||||
extensions: extensions,
|
||||
awaitable: false,
|
||||
),
|
||||
);
|
||||
|
@ -66,7 +66,7 @@ class PresenceManager extends XmppManagerBase {
|
||||
stanzaTag: 'presence',
|
||||
callback: _onPresence,
|
||||
priority: presenceHandlerPriority,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -122,7 +122,7 @@ class RosterManager extends XmppManagerBase {
|
||||
tagName: 'query',
|
||||
tagXmlns: rosterXmlns,
|
||||
callback: _onRosterPush,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -277,7 +277,7 @@ class RosterManager extends XmppManagerBase {
|
||||
attributes: {
|
||||
'ver': await _stateManager.getRosterVersion() ?? '',
|
||||
},
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -319,14 +319,12 @@ class RosterManager extends XmppManagerBase {
|
||||
tag: 'item',
|
||||
attributes: <String, String>{
|
||||
'jid': jid,
|
||||
...title == jid.split('@')[0]
|
||||
? <String, String>{}
|
||||
: <String, String>{'name': title}
|
||||
if (title == jid.split('@')[0]) 'name': title,
|
||||
},
|
||||
children: (groups ?? [])
|
||||
.map((group) => XMLNode(tag: 'group', text: group))
|
||||
.toList(),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
@ -357,13 +355,13 @@ class RosterManager extends XmppManagerBase {
|
||||
children: [
|
||||
XMLNode(
|
||||
tag: 'item',
|
||||
attributes: <String, String>{
|
||||
attributes: {
|
||||
'jid': jid,
|
||||
'subscription': 'remove'
|
||||
'subscription': 'remove',
|
||||
},
|
||||
)
|
||||
),
|
||||
],
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
@ -7,6 +7,7 @@ import 'package:moxxmpp/src/util/typed_map.dart';
|
||||
class StanzaDetails {
|
||||
const StanzaDetails(
|
||||
this.stanza, {
|
||||
this.extensions,
|
||||
this.addId = true,
|
||||
this.awaitable = true,
|
||||
this.shouldEncrypt = true,
|
||||
@ -19,6 +20,9 @@ class StanzaDetails {
|
||||
/// The stanza to send.
|
||||
final Stanza stanza;
|
||||
|
||||
/// The extension data used for constructing the stanza.
|
||||
final TypedMap<StanzaHandlerExtension>? extensions;
|
||||
|
||||
/// Flag indicating whether a stanza id should be added before sending.
|
||||
final bool addId;
|
||||
|
||||
@ -244,15 +248,14 @@ XMLNode buildErrorElement(String type, String condition, {String? text}) {
|
||||
XMLNode.xmlns(
|
||||
tag: condition,
|
||||
xmlns: fullStanzaXmlns,
|
||||
children: text != null
|
||||
? [
|
||||
children: [
|
||||
if (text != null)
|
||||
XMLNode.xmlns(
|
||||
tag: 'text',
|
||||
xmlns: fullStanzaXmlns,
|
||||
text: text,
|
||||
)
|
||||
]
|
||||
: [],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
|
@ -10,14 +10,14 @@ class DataFormOption {
|
||||
XMLNode toXml() {
|
||||
return XMLNode(
|
||||
tag: 'option',
|
||||
attributes: label != null
|
||||
? <String, dynamic>{'label': label}
|
||||
: <String, dynamic>{},
|
||||
attributes: {
|
||||
if (label != null) 'label': label,
|
||||
},
|
||||
children: [
|
||||
XMLNode(
|
||||
tag: 'value',
|
||||
text: value,
|
||||
)
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
@ -45,19 +45,22 @@ class DataFormField {
|
||||
return XMLNode(
|
||||
tag: 'field',
|
||||
attributes: <String, dynamic>{
|
||||
...varAttr != null
|
||||
? <String, dynamic>{'var': varAttr}
|
||||
: <String, dynamic>{},
|
||||
...type != null ? <String, dynamic>{'type': type} : <String, dynamic>{},
|
||||
...label != null
|
||||
? <String, dynamic>{'label': label}
|
||||
: <String, dynamic>{}
|
||||
if (varAttr != null) 'var': varAttr,
|
||||
if (type != null) 'type': type,
|
||||
if (label != null) 'label': label,
|
||||
},
|
||||
children: [
|
||||
...description != null ? [XMLNode(tag: 'desc', text: description)] : [],
|
||||
...isRequired ? [XMLNode(tag: 'required')] : [],
|
||||
if (description != null)
|
||||
XMLNode(
|
||||
tag: 'desc',
|
||||
text: description,
|
||||
),
|
||||
if (isRequired)
|
||||
XMLNode(
|
||||
tag: 'required',
|
||||
),
|
||||
...values.map((value) => XMLNode(tag: 'value', text: value)),
|
||||
...options.map((option) => option.toXml())
|
||||
...options.map((option) => option.toXml()),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
@ -13,8 +13,10 @@ Stanza buildDiscoInfoQueryStanza(JID entity, String? node) {
|
||||
XMLNode.xmlns(
|
||||
tag: 'query',
|
||||
xmlns: discoInfoXmlns,
|
||||
attributes: node != null ? {'node': node} : {},
|
||||
)
|
||||
attributes: {
|
||||
if (node != null) 'node': node,
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
@ -27,8 +29,10 @@ Stanza buildDiscoItemsQueryStanza(JID entity, {String? node}) {
|
||||
XMLNode.xmlns(
|
||||
tag: 'query',
|
||||
xmlns: discoItemsXmlns,
|
||||
attributes: node != null ? {'node': node} : {},
|
||||
)
|
||||
attributes: {
|
||||
if (node != null) 'node': node,
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
@ -19,13 +19,11 @@ class Identity {
|
||||
XMLNode toXMLNode() {
|
||||
return XMLNode(
|
||||
tag: 'identity',
|
||||
attributes: <String, dynamic>{
|
||||
attributes: {
|
||||
'category': category,
|
||||
'type': type,
|
||||
'name': name,
|
||||
...lang == null
|
||||
? <String, dynamic>{}
|
||||
: <String, dynamic>{'xml:lang': lang}
|
||||
if (lang != null) 'xml:lang': lang,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
@ -33,11 +33,22 @@ class RoomInformation {
|
||||
final String name;
|
||||
}
|
||||
|
||||
/// The used message-id and an optional origin-id.
|
||||
typedef PendingMessage = (String, String?);
|
||||
|
||||
class RoomState {
|
||||
RoomState({
|
||||
required this.roomJid,
|
||||
this.nick,
|
||||
});
|
||||
final JID roomJid;
|
||||
String? nick;
|
||||
RoomState({required this.roomJid, this.nick, required this.joined}) {
|
||||
pendingMessages = List<PendingMessage>.empty(growable: true);
|
||||
}
|
||||
|
||||
/// The JID of the room.
|
||||
final JID roomJid;
|
||||
|
||||
/// The nick we're joined with.
|
||||
String? nick;
|
||||
|
||||
/// Flag whether we're joined and can process messages
|
||||
bool joined;
|
||||
|
||||
late final List<PendingMessage> pendingMessages;
|
||||
}
|
||||
|
@ -1,6 +1,9 @@
|
||||
import 'package:moxlib/moxlib.dart';
|
||||
import 'package:moxxmpp/src/events.dart';
|
||||
import 'package:moxxmpp/src/jid.dart';
|
||||
import 'package:moxxmpp/src/managers/base.dart';
|
||||
import 'package:moxxmpp/src/managers/data.dart';
|
||||
import 'package:moxxmpp/src/managers/handlers.dart';
|
||||
import 'package:moxxmpp/src/managers/namespaces.dart';
|
||||
import 'package:moxxmpp/src/namespaces.dart';
|
||||
import 'package:moxxmpp/src/stanza.dart';
|
||||
@ -9,8 +12,13 @@ import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
|
||||
import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
|
||||
import 'package:moxxmpp/src/xeps/xep_0045/errors.dart';
|
||||
import 'package:moxxmpp/src/xeps/xep_0045/types.dart';
|
||||
import 'package:moxxmpp/src/xeps/xep_0359.dart';
|
||||
import 'package:synchronized/extension.dart';
|
||||
import 'package:synchronized/synchronized.dart';
|
||||
|
||||
/// (Room JID, nickname)
|
||||
typedef MUCRoomJoin = (JID, String);
|
||||
|
||||
class MUCManager extends XmppManagerBase {
|
||||
MUCManager() : super(mucManager);
|
||||
|
||||
@ -23,6 +31,78 @@ class MUCManager extends XmppManagerBase {
|
||||
/// Cache lock
|
||||
final Lock _cacheLock = Lock();
|
||||
|
||||
/// Flag indicating whether we joined the rooms added to the room list with
|
||||
/// [prepareRoomList].
|
||||
bool _joinedPreparedRooms = true;
|
||||
|
||||
@override
|
||||
List<StanzaHandler> getIncomingStanzaHandlers() => [
|
||||
StanzaHandler(
|
||||
stanzaTag: 'message',
|
||||
callback: _onMessage,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
List<StanzaHandler> getOutgoingPreStanzaHandlers() => [
|
||||
StanzaHandler(
|
||||
stanzaTag: 'message',
|
||||
callback: _onMessageSent,
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
Future<void> onXmppEvent(XmppEvent event) async {
|
||||
if (event is! StreamNegotiationsDoneEvent) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Only attempt rejoining if we did not resume the stream and all
|
||||
// prepared rooms are already joined.
|
||||
if (event.resumed && _joinedPreparedRooms) {
|
||||
return;
|
||||
}
|
||||
|
||||
await _cacheLock.synchronized(() async {
|
||||
// Mark all groupchats as not joined.
|
||||
for (final jid in _mucRoomCache.keys) {
|
||||
_mucRoomCache[jid]!.joined = false;
|
||||
|
||||
// Re-join all MUCs.
|
||||
final state = _mucRoomCache[jid]!;
|
||||
await _sendMucJoin(
|
||||
jid,
|
||||
state.nick!,
|
||||
0,
|
||||
);
|
||||
}
|
||||
_joinedPreparedRooms = true;
|
||||
});
|
||||
}
|
||||
|
||||
/// Prepares the internal room list to ensure that the rooms
|
||||
/// [rooms] are joined once we are connected.
|
||||
Future<void> prepareRoomList(List<MUCRoomJoin> rooms) async {
|
||||
assert(
|
||||
rooms.isNotEmpty,
|
||||
'The room list should not be empty',
|
||||
);
|
||||
|
||||
await _cacheLock.synchronized(() {
|
||||
_joinedPreparedRooms = false;
|
||||
for (final room in rooms) {
|
||||
final (roomJid, nick) = room;
|
||||
_mucRoomCache[roomJid] = RoomState(
|
||||
roomJid: roomJid,
|
||||
nick: nick,
|
||||
joined: false,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// Queries the information of a Multi-User Chat room.
|
||||
///
|
||||
/// Retrieves the information about the specified MUC room by performing a
|
||||
@ -55,11 +135,32 @@ class MUCManager extends XmppManagerBase {
|
||||
/// if applicable.
|
||||
Future<Result<bool, MUCError>> joinRoom(
|
||||
JID roomJid,
|
||||
String nick,
|
||||
) async {
|
||||
String nick, {
|
||||
int? maxHistoryStanzas,
|
||||
}) async {
|
||||
if (nick.isEmpty) {
|
||||
return Result(NoNicknameSpecified());
|
||||
}
|
||||
|
||||
await _cacheLock.synchronized(
|
||||
() {
|
||||
_mucRoomCache[roomJid] = RoomState(
|
||||
roomJid: roomJid,
|
||||
nick: nick,
|
||||
joined: false,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
await _sendMucJoin(roomJid, nick, maxHistoryStanzas);
|
||||
return const Result(true);
|
||||
}
|
||||
|
||||
Future<void> _sendMucJoin(
|
||||
JID roomJid,
|
||||
String nick,
|
||||
int? maxHistoryStanzas,
|
||||
) async {
|
||||
await getAttributes().sendStanza(
|
||||
StanzaDetails(
|
||||
Stanza.presence(
|
||||
@ -68,17 +169,20 @@ class MUCManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'x',
|
||||
xmlns: mucXmlns,
|
||||
)
|
||||
children: [
|
||||
if (maxHistoryStanzas != null)
|
||||
XMLNode(
|
||||
tag: 'history',
|
||||
attributes: {
|
||||
'maxstanzas': maxHistoryStanzas.toString(),
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
await _cacheLock.synchronized(
|
||||
() {
|
||||
_mucRoomCache[roomJid] = RoomState(roomJid: roomJid, nick: nick);
|
||||
},
|
||||
);
|
||||
return const Result(true);
|
||||
}
|
||||
|
||||
/// Leaves a Multi-User Chat room.
|
||||
@ -108,4 +212,86 @@ class MUCManager extends XmppManagerBase {
|
||||
);
|
||||
return const Result(true);
|
||||
}
|
||||
|
||||
Future<StanzaHandlerData> _onMessageSent(
|
||||
Stanza message,
|
||||
StanzaHandlerData state,
|
||||
) async {
|
||||
if (message.to == null) {
|
||||
return state;
|
||||
}
|
||||
final toJid = JID.fromString(message.to!);
|
||||
|
||||
return _cacheLock.synchronized(() {
|
||||
if (!_mucRoomCache.containsKey(toJid)) {
|
||||
return state;
|
||||
}
|
||||
|
||||
_mucRoomCache[toJid]!.pendingMessages.add(
|
||||
(message.id!, state.extensions.get<StableIdData>()?.originId),
|
||||
);
|
||||
return state;
|
||||
});
|
||||
}
|
||||
|
||||
Future<StanzaHandlerData> _onMessage(
|
||||
Stanza message,
|
||||
StanzaHandlerData state,
|
||||
) async {
|
||||
final fromJid = JID.fromString(message.from!);
|
||||
final roomJid = fromJid.toBare();
|
||||
return _mucRoomCache.synchronized(() {
|
||||
final roomState = _mucRoomCache[roomJid];
|
||||
if (roomState == null) {
|
||||
return state;
|
||||
}
|
||||
|
||||
if (message.type == 'groupchat' && message.firstTag('subject') != null) {
|
||||
// The room subject marks the end of the join flow.
|
||||
if (!roomState.joined) {
|
||||
// Mark the room as joined.
|
||||
_mucRoomCache[roomJid]!.joined = true;
|
||||
logger.finest('$roomJid is now joined');
|
||||
}
|
||||
|
||||
// TODO(Unknown): Signal the subject?
|
||||
|
||||
return StanzaHandlerData(
|
||||
true,
|
||||
false,
|
||||
message,
|
||||
state.extensions,
|
||||
);
|
||||
} else {
|
||||
if (!roomState.joined) {
|
||||
// Ignore the discussion history.
|
||||
return StanzaHandlerData(
|
||||
true,
|
||||
false,
|
||||
message,
|
||||
state.extensions,
|
||||
);
|
||||
}
|
||||
|
||||
// Check if this is the message reflection.
|
||||
final pending =
|
||||
(message.id!, state.extensions.get<StableIdData>()?.originId);
|
||||
if (fromJid.resource == roomState.nick &&
|
||||
roomState.pendingMessages.contains(pending)) {
|
||||
// Silently drop the message.
|
||||
roomState.pendingMessages.remove(pending);
|
||||
|
||||
// TODO(Unknown): Maybe send an event stating that we received the reflection.
|
||||
return StanzaHandlerData(
|
||||
true,
|
||||
false,
|
||||
message,
|
||||
state.extensions,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return state;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ class VCardManager extends XmppManagerBase {
|
||||
tagName: 'x',
|
||||
tagXmlns: vCardTempUpdate,
|
||||
callback: _onPresence,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -108,7 +108,7 @@ class VCardManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'vCard',
|
||||
xmlns: vCardTempXmlns,
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
encrypted: true,
|
||||
|
@ -38,26 +38,20 @@ class PubSubPublishOptions {
|
||||
varAttr: 'FORM_TYPE',
|
||||
type: 'hidden',
|
||||
),
|
||||
...accessModel != null
|
||||
? [
|
||||
if (accessModel != null)
|
||||
DataFormField(
|
||||
options: [],
|
||||
isRequired: false,
|
||||
values: [accessModel!],
|
||||
varAttr: 'pubsub#access_model',
|
||||
)
|
||||
]
|
||||
: [],
|
||||
...maxItems != null
|
||||
? [
|
||||
),
|
||||
if (maxItems != null)
|
||||
DataFormField(
|
||||
options: [],
|
||||
isRequired: false,
|
||||
values: [maxItems!],
|
||||
varAttr: 'pubsub#max_items',
|
||||
),
|
||||
]
|
||||
: [],
|
||||
],
|
||||
).toXml();
|
||||
}
|
||||
@ -87,7 +81,7 @@ class PubSubManager extends XmppManagerBase {
|
||||
tagName: 'event',
|
||||
tagXmlns: pubsubEventXmlns,
|
||||
callback: _onPubsubMessage,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -314,11 +308,11 @@ class PubSubManager extends XmppManagerBase {
|
||||
children: [
|
||||
XMLNode(
|
||||
tag: 'item',
|
||||
attributes: id != null
|
||||
? <String, String>{'id': id}
|
||||
: <String, String>{},
|
||||
attributes: {
|
||||
if (id != null) 'id': id,
|
||||
},
|
||||
children: [payload],
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
if (pubOptions != null)
|
||||
@ -327,7 +321,7 @@ class PubSubManager extends XmppManagerBase {
|
||||
children: [pubOptions.toXml()],
|
||||
),
|
||||
],
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
shouldEncrypt: false,
|
||||
@ -422,7 +416,7 @@ class PubSubManager extends XmppManagerBase {
|
||||
},
|
||||
),
|
||||
],
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
shouldEncrypt: false,
|
||||
|
@ -45,7 +45,7 @@ class OOBManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the message manager
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -69,7 +69,7 @@ class ChatStateManager extends XmppManagerBase {
|
||||
callback: _onChatStateReceived,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -66,7 +66,7 @@ class MessageDeliveryReceiptManager extends XmppManagerBase {
|
||||
callback: _onDeliveryRequestReceived,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -27,7 +27,7 @@ class BlockingManager extends XmppManagerBase {
|
||||
tagName: 'block',
|
||||
tagXmlns: blockingXmlns,
|
||||
callback: _blockPush,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -107,10 +107,12 @@ class BlockingManager extends XmppManagerBase {
|
||||
children: items.map((item) {
|
||||
return XMLNode(
|
||||
tag: 'item',
|
||||
attributes: <String, String>{'jid': item},
|
||||
attributes: {
|
||||
'jid': item,
|
||||
},
|
||||
);
|
||||
}).toList(),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -128,7 +130,7 @@ class BlockingManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'unblock',
|
||||
xmlns: blockingXmlns,
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -152,11 +154,13 @@ class BlockingManager extends XmppManagerBase {
|
||||
.map(
|
||||
(item) => XMLNode(
|
||||
tag: 'item',
|
||||
attributes: <String, String>{'jid': item},
|
||||
attributes: {
|
||||
'jid': item,
|
||||
},
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -174,7 +178,7 @@ class BlockingManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'blocklist',
|
||||
xmlns: blockingXmlns,
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
@ -5,7 +5,10 @@ class StreamManagementEnableNonza extends XMLNode {
|
||||
StreamManagementEnableNonza()
|
||||
: super(
|
||||
tag: 'enable',
|
||||
attributes: <String, String>{'xmlns': smXmlns, 'resume': 'true'},
|
||||
attributes: {
|
||||
'xmlns': smXmlns,
|
||||
'resume': 'true',
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -13,10 +16,10 @@ class StreamManagementResumeNonza extends XMLNode {
|
||||
StreamManagementResumeNonza(String id, int h)
|
||||
: super(
|
||||
tag: 'resume',
|
||||
attributes: <String, String>{
|
||||
attributes: {
|
||||
'xmlns': smXmlns,
|
||||
'previd': id,
|
||||
'h': h.toString()
|
||||
'h': h.toString(),
|
||||
},
|
||||
);
|
||||
}
|
||||
@ -25,7 +28,10 @@ class StreamManagementAckNonza extends XMLNode {
|
||||
StreamManagementAckNonza(int h)
|
||||
: super(
|
||||
tag: 'a',
|
||||
attributes: <String, String>{'xmlns': smXmlns, 'h': h.toString()},
|
||||
attributes: {
|
||||
'xmlns': smXmlns,
|
||||
'h': h.toString(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -33,7 +39,7 @@ class StreamManagementRequestNonza extends XMLNode {
|
||||
StreamManagementRequestNonza()
|
||||
: super(
|
||||
tag: 'r',
|
||||
attributes: <String, String>{
|
||||
attributes: {
|
||||
'xmlns': smXmlns,
|
||||
},
|
||||
);
|
||||
|
@ -140,7 +140,7 @@ class StreamManagementManager extends XmppManagerBase {
|
||||
nonzaTag: 'a',
|
||||
nonzaXmlns: smXmlns,
|
||||
callback: _handleAckResponse,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -148,14 +148,14 @@ class StreamManagementManager extends XmppManagerBase {
|
||||
StanzaHandler(
|
||||
callback: _onServerStanzaReceived,
|
||||
priority: 9999,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
List<StanzaHandler> getOutgoingPostStanzaHandlers() => [
|
||||
StanzaHandler(
|
||||
callback: _onClientStanzaSent,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -49,7 +49,7 @@ class CarbonsManager extends XmppManagerBase {
|
||||
tagXmlns: carbonsXmlns,
|
||||
callback: _onMessageSent,
|
||||
priority: -98,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -124,7 +124,7 @@ class CarbonsManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'enable',
|
||||
xmlns: carbonsXmlns,
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -154,7 +154,7 @@ class CarbonsManager extends XmppManagerBase {
|
||||
XMLNode.xmlns(
|
||||
tag: 'disable',
|
||||
xmlns: carbonsXmlns,
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
@ -40,7 +40,7 @@ class LastMessageCorrectionManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -100,7 +100,7 @@ class ChatMarkerManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -81,7 +81,7 @@ class StableIdManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the MessageManager
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
@ -127,7 +127,13 @@ class StableIdManager extends XmppManagerBase {
|
||||
TypedMap<StanzaHandlerExtension> extensions,
|
||||
) {
|
||||
final data = extensions.get<StableIdData>();
|
||||
return data != null ? data.toXML() : [];
|
||||
if (data?.originId != null) {
|
||||
return [
|
||||
data!.toOriginIdElement(),
|
||||
];
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -161,9 +161,9 @@ class HttpFileUploadManager extends XmppManagerBase {
|
||||
attributes: {
|
||||
'filename': filename,
|
||||
'size': filesize.toString(),
|
||||
...contentType != null ? {'content-type': contentType} : {}
|
||||
if (contentType != null) 'content-type': contentType,
|
||||
},
|
||||
)
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
@ -2,10 +2,10 @@ abstract class OmemoError {}
|
||||
|
||||
class UnknownOmemoError extends OmemoError {}
|
||||
|
||||
class InvalidAffixElementsException with Exception {}
|
||||
class InvalidAffixElementsException implements Exception {}
|
||||
|
||||
class OmemoNotSupportedForContactException extends OmemoError {}
|
||||
|
||||
class EncryptionFailedException with Exception {}
|
||||
class EncryptionFailedException implements Exception {}
|
||||
|
||||
class InvalidEnvelopePayloadException with Exception {}
|
||||
class InvalidEnvelopePayloadException implements Exception {}
|
||||
|
@ -82,7 +82,7 @@ class SIMSManager extends XmppManagerBase {
|
||||
tagXmlns: referenceXmlns,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -31,7 +31,7 @@ class MessageRetractionManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the MessageManager
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -133,7 +133,7 @@ class SFSManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the message handler
|
||||
priority: -98,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -96,7 +96,7 @@ class MessageRepliesManager extends XmppManagerBase {
|
||||
callback: _onMessage,
|
||||
// Before the message handler
|
||||
priority: -99,
|
||||
)
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
|
@ -5,7 +5,7 @@ homepage: https://codeberg.org/moxxy/moxxmpp
|
||||
publish_to: https://git.polynom.me/api/packages/Moxxy/pub
|
||||
|
||||
environment:
|
||||
sdk: '>=2.17.5 <3.0.0'
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
|
||||
dependencies:
|
||||
collection: ^1.16.0
|
||||
|
@ -14,9 +14,9 @@ final scramSha1StreamFeatures = XMLNode(
|
||||
XMLNode(
|
||||
tag: 'mechanism',
|
||||
text: 'SCRAM-SHA-1',
|
||||
)
|
||||
),
|
||||
],
|
||||
)
|
||||
),
|
||||
],
|
||||
);
|
||||
final scramSha256StreamFeatures = XMLNode(
|
||||
@ -29,9 +29,9 @@ final scramSha256StreamFeatures = XMLNode(
|
||||
XMLNode(
|
||||
tag: 'mechanism',
|
||||
text: 'SCRAM-SHA-256',
|
||||
)
|
||||
),
|
||||
],
|
||||
)
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
|
@ -171,7 +171,7 @@ void main() {
|
||||
),
|
||||
tagName: '3',
|
||||
priority: 50,
|
||||
)
|
||||
),
|
||||
]..sort(stanzaHandlerSortComparator);
|
||||
|
||||
expect(handlerList[0].tagName, '1');
|
||||
|
@ -158,7 +158,7 @@ void main() {
|
||||
</iq>''',
|
||||
ignoreId: true,
|
||||
adjustId: true,
|
||||
)
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
|
@ -69,7 +69,7 @@ class StubbedDiscoManager extends DiscoManager {
|
||||
isRequired: false,
|
||||
varAttr: 'FORM_TYPE',
|
||||
type: 'hidden',
|
||||
)
|
||||
),
|
||||
],
|
||||
reported: [],
|
||||
items: [],
|
||||
@ -153,14 +153,14 @@ void main() {
|
||||
'http://jabber.org/protocol/caps',
|
||||
'http://jabber.org/protocol/disco#info',
|
||||
'http://jabber.org/protocol/disco#items',
|
||||
'http://jabber.org/protocol/muc'
|
||||
'http://jabber.org/protocol/muc',
|
||||
],
|
||||
const [
|
||||
Identity(
|
||||
category: 'client',
|
||||
type: 'pc',
|
||||
name: 'Exodus 0.9.1',
|
||||
)
|
||||
),
|
||||
],
|
||||
const [],
|
||||
null,
|
||||
@ -179,7 +179,7 @@ void main() {
|
||||
'http://jabber.org/protocol/caps',
|
||||
'http://jabber.org/protocol/disco#info',
|
||||
'http://jabber.org/protocol/disco#items',
|
||||
'http://jabber.org/protocol/muc'
|
||||
'http://jabber.org/protocol/muc',
|
||||
],
|
||||
const [
|
||||
Identity(
|
||||
@ -295,14 +295,14 @@ void main() {
|
||||
'urn:xmpp:message-correct:0',
|
||||
'urn:xmpp:ping',
|
||||
'urn:xmpp:receipts',
|
||||
'urn:xmpp:time'
|
||||
'urn:xmpp:time',
|
||||
],
|
||||
const [
|
||||
Identity(
|
||||
category: 'client',
|
||||
type: 'phone',
|
||||
name: 'Conversations',
|
||||
)
|
||||
),
|
||||
],
|
||||
const [],
|
||||
null,
|
||||
|
@ -433,7 +433,8 @@ void main() {
|
||||
});
|
||||
|
||||
test('Test a failed stream resumption', () async {
|
||||
final fakeSocket = StubTCPSocket([
|
||||
final fakeSocket = StubTCPSocket(
|
||||
[
|
||||
StringExpectation(
|
||||
"<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' from='polynomdivision@test.server' xml:lang='en'>",
|
||||
'''
|
||||
@ -486,8 +487,9 @@ void main() {
|
||||
StringExpectation(
|
||||
"<enable xmlns='urn:xmpp:sm:3' resume='true' />",
|
||||
'<enabled xmlns="urn:xmpp:sm:3" id="id-2" resume="true" />',
|
||||
)
|
||||
]);
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
final conn = XmppConnection(
|
||||
TestingReconnectionPolicy(),
|
||||
|
@ -115,7 +115,8 @@ void main() {
|
||||
test('Test sending a message processing hint', () async {
|
||||
final manager = MessageManager();
|
||||
final holder = TestingManagerHolder(
|
||||
stubSocket: StubTCPSocket([
|
||||
stubSocket: StubTCPSocket(
|
||||
[
|
||||
StanzaExpectation(
|
||||
'''
|
||||
<message to="user@example.org" type="chat">
|
||||
@ -124,8 +125,9 @@ void main() {
|
||||
</message>
|
||||
''',
|
||||
'',
|
||||
)
|
||||
]),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
await holder.register([
|
||||
|
@ -6,7 +6,7 @@ void main() {
|
||||
test('invariance', () {
|
||||
final headers = {
|
||||
'authorization': 'Basic Base64String==',
|
||||
'cookie': 'foo=bar; user=romeo'
|
||||
'cookie': 'foo=bar; user=romeo',
|
||||
};
|
||||
expect(
|
||||
prepareHeaders(headers),
|
||||
@ -16,7 +16,7 @@ void main() {
|
||||
test('invariance through uppercase', () {
|
||||
final headers = {
|
||||
'Authorization': 'Basic Base64String==',
|
||||
'Cookie': 'foo=bar; user=romeo'
|
||||
'Cookie': 'foo=bar; user=romeo',
|
||||
};
|
||||
expect(
|
||||
prepareHeaders(headers),
|
||||
@ -27,7 +27,7 @@ void main() {
|
||||
final headers = {
|
||||
'Authorization': 'Basic Base64String==',
|
||||
'Cookie': 'foo=bar; user=romeo',
|
||||
'X-Tracking': 'Base64String=='
|
||||
'X-Tracking': 'Base64String==',
|
||||
};
|
||||
expect(prepareHeaders(headers), {
|
||||
'Authorization': 'Basic Base64String==',
|
||||
|
Loading…
Reference in New Issue
Block a user