frodovdr/node-red-nodes
1
0
Fork 0
mirror of https://github.com/node-red/node-red-nodes.git synced 2023-10-10 13:36:58 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/node-red/node-red-nodes

Browse Source 
merge upstream
This commit is contained in:
Dave Conway-Jones 2021-02-02 10:12:32 +00:00
parent 778fd68354
commit f99e52d1fa
No known key found for this signature in database
GPG Key ID: 88BA2B8A411BE9FF
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
social/xmpp/92-xmpp.js
View File

@ -50,6 +50,8 @@ module.exports = function(RED) {
this.connected = false; this.connected = false;
// store the nodes that have us as config so we know when to tear it all down. // store the nodes that have us as config so we know when to tear it all down.
this.users = {}; this.users = {};
// Store the chatrooms (MUC) that we've joined (sent "presence" XML to) already
this.MUCs = {};
// helper variable, because "this" changes definition inside a callback // helper variable, because "this" changes definition inside a callback
var that = this; var that = this;
@ -216,14 +218,23 @@ module.exports = function(RED) {
// if we want to support passwords, we need to add that as a child of the x element // if we want to support passwords, we need to add that as a child of the x element
// (third argument to the x/muc/children ) // (third argument to the x/muc/children )
// We also turn off chat history (maxstanzas 0) because that's not what this node is about. // We also turn off chat history (maxstanzas 0) because that's not what this node is about.
// Yes, there's a race condition, but it's not a huge problem to send two messages
// so we don't care.
if (name in node.serverConfig.MUCs) {
if (RED.settings.verbose || LOGITALL) {
node.log("already joined MUC "+name);
}
}
else {
var stanza = xml('presence', var stanza = xml('presence',
{"to": name}, {"to": name},
xml("x",'http://jabber.org/protocol/muc'), xml("x",'http://jabber.org/protocol/muc'),
{ maxstanzas:0, seconds:1 } { maxstanzas:0, seconds:1 }
); );
node.serverConfig.used(node); node.serverConfig.used(node);
node.serverConfig.MUCs[name] = "joined";
xmpp.send(stanza); xmpp.send(stanza);
}
} }
// separated out since we want the same functionality from both in and out nodes // separated out since we want the same functionality from both in and out nodes
@ -579,7 +590,13 @@ module.exports = function(RED) {
var to = node.to || msg.topic || ""; var to = node.to || msg.topic || "";
if (to !== "") { if (to !== "") {
var message; var message;
var type = node.join? "groupchat":"chat"; var type = "chat";
if (node.join) {
// we want to connect to groupchat / chatroom / MUC
type = "groupchat";
// joinMUC will do nothing if we're already joined
joinMUC(node, xmpp, to+'/'+node.nick);
}
if (node.sendAll) { if (node.sendAll) {
message = xml( message = xml(
"message", "message",

2
social/xmpp/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "node-red-node-xmpp", "name": "node-red-node-xmpp",
"version": "0.3.2", "version": "0.3.3",
"description": "A Node-RED node to talk to an XMPP server", "description": "A Node-RED node to talk to an XMPP server",
"dependencies": { "dependencies": {
"@xmpp/client": "^0.12.0" "@xmpp/client": "^0.12.0"