From 4cfbc6a32aa3228d1cff0df816f2f3841cd57034 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 29 Jun 2022 10:06:24 +0100
Subject: [PATCH] Add resource and separate out domain in XMPP node

to address #881
---
 social/xmpp/92-xmpp.html |  9 +++++++--
 social/xmpp/92-xmpp.js   | 10 ++++++++--
 social/xmpp/package.json |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/social/xmpp/92-xmpp.html b/social/xmpp/92-xmpp.html
index d042095a..ab299773 100644
--- a/social/xmpp/92-xmpp.html
+++ b/social/xmpp/92-xmpp.html
@@ -157,13 +157,17 @@
         <input type="text" id="node-config-input-user" placeholder="joe@blah.im">
     </div>
     <div class="form-row">
-        <label for="node-config-input-nickname"><i class="fa fa-user"></i> Nickname</label>
+        <label for="node-config-input-nickname"><i class="fa fa-heart"></i> Nickname</label>
         <input type="text" id="node-config-input-nickname" placeholder="Joe (optional)">
     </div>
     <div class="form-row">
         <label for="node-config-input-password"><i class="fa fa-lock"></i> Password</label>
         <input type="password" id="node-config-input-password">
     </div>
+    <div class="form-row">
+        <label for="node-config-input-resource"><i class="fa fa-globe"></i> Resource</label>
+        <input type="text" id="node-config-input-resource" placeholder="optional resource id">
+    </div>
 </script>
 
 <script type="text/javascript">
@@ -173,7 +177,8 @@
             server: {value:"", required:false},
             port: {value:5222, required:false, validate:RED.validators.number()},
             user: {value:""},
-            nickname: {value:""}
+            nickname: {value:""},
+            resource: {value:""}
         },
         credentials: {
             password: {type:"password"}
diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js
index f006bfed..60809533 100644
--- a/social/xmpp/92-xmpp.js
+++ b/social/xmpp/92-xmpp.js
@@ -30,6 +30,8 @@ module.exports = function(RED) {
         else {
             this.port = parseInt(n.port);
         }
+        this.domain = this.jid.split('@')[1] || this.server;
+        this.resource = n.resource || "";
 
         // The password is obfuscated and stored in a separate location
         var credentials = this.credentials;
@@ -45,12 +47,16 @@ module.exports = function(RED) {
         if (RED.settings.verbose || LOGITALL) {
             this.log("Setting up connection xmpp: {service: "+proto+"://"+this.server+":"+this.port+", username: "+this.username+", password: "+this.password+"}");
         }
-        this.client = client({
+        var opts = {
             service: proto+'://' + this.server + ':' + this.port,
+            domain: this.domain,
             username: this.username,
             password: this.password,
             timeout: 60000
-        });
+        }
+        if (this.resource !== "") { opts.resource = this.resource; }
+        console.log("OPTS",opts)
+        this.client = client(opts);
 
         this.client.timeout = 60000;
         // helper variable for checking against later, maybe we should be using the client
diff --git a/social/xmpp/package.json b/social/xmpp/package.json
index f818a3de..b0cadcb4 100644
--- a/social/xmpp/package.json
+++ b/social/xmpp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-node-xmpp",
-    "version": "0.5.10",
+    "version": "0.6.0",
     "description": "A Node-RED node to talk to an XMPP server",
     "dependencies": {
         "@xmpp/client": "^0.13.1"