@sockethub/platform-xmpp 5.0.0-alpha.3 → 5.0.0-alpha.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sockethub/platform-xmpp",
   "description": "A sockethub platform module implementing XMPP functionality",
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.4",
   "private": false,
   "author": "Nick Jennings <nick@silverbucket.net>",
   "license": "LGPL-3.0+",
@@ -22,17 +22,17 @@
   },
   "homepage": "https://github.com/sockethub/sockethub/tree/master/packages/platform-xmpp",
   "dependencies": {
-    "@xmpp/client": "^0.13.0",
-    "c8": "7.11.0"
+    "@xmpp/client": "^0.13.0"
   },
   "devDependencies": {
-    "@sockethub/schemas": "^3.0.0-alpha.3",
+    "@sockethub/schemas": "^3.0.0-alpha.4",
+    "c8": "7.12.0",
     "chai": "4.3.6",
-    "eslint": "8.9.0",
+    "eslint": "8.23.1",
     "jsdoc-to-markdown": "7.1.1",
-    "mocha": "9.2.1",
+    "mocha": "10.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "13.0.1"
+    "sinon": "14.0.0"
   },
   "peerDependencies": {
     "@sockethub/server": ">=5.0.0-alpha.2"
@@ -53,5 +53,5 @@
     "coverage": "c8 check-coverage --statements 85 --branches 80 --functions 70 --lines 85",
     "doc": "jsdoc2md --no-gfm --heading-depth 1 src/index.js > API.md"
   },
-  "gitHead": "f02238a478b7ffd3f31d8deea292eb67e630a86b"
+  "gitHead": "c6d34ff44d2be479e4ea42c46da649612342a680"
 }

package/src/incoming-handlers.data.js

@@ -78,11 +78,15 @@ module.exports = [
     {
       context: 'xmpp',
       type: 'send',
-      published: '2021-04-17T18:50:25Z',
+      published: '2021-04-17T18:50:25.000Z',
       actor: { type: 'person', id: 'radical@example.org/thinkpad' },
       target: { type: 'person', id: 'user@jabber.org' },
-      object: { type: 'message', content: 'ohai',
-        id: 'purple9840c15f', 'xmpp:stanza-id': '123456789' }
+      object: {
+        type: 'message',
+        content: 'ohai',
+        id: 'purple9840c15f',
+        'xmpp:stanza-id': '123456789'
+      }
     }
   ],
   [

package/src/incoming-handlers.js

@@ -45,6 +45,14 @@ function getMessageReplaceId(stanza) {
   }
 }
 
+function getPresence(stanza) {
+  if (stanza.getChild('show')) {
+    return stanza.getChild('show').getText();
+  } else {
+    return stanza.attrs.type === "unavailable" ? "offline" : "online";
+  }
+}
+
 class IncomingHandlers {
   constructor(session) {
     this.session = session;
@@ -93,11 +101,7 @@ class IncomingHandlers {
     if (stanza.getChildText('status')) {
       obj.object.content = stanza.getChildText('status');
     }
-    if (stanza.getChild('show')) {
-      obj.object.presence = stanza.getChild('show').getText();
-    } else {
-      obj.object.presence = stanza.attrs.type === "unavailable" ? "offline" : "online";
-    }
+    obj.object.presence = getPresence(stanza);
     if (stanza.attrs.to) {
       obj.target = {id: stanza.attrs.to, type: 'person'};
     } else {
@@ -168,7 +172,7 @@ class IncomingHandlers {
       [activity.target['id'], activity.actor.name] = from.split('/');
     }
 
-    if (timestamp) { activity.published = timestamp; }
+    if (timestamp) { activity.published = (new Date(timestamp)).toISOString(); }
 
     this.session.sendToClient(activity);
   }
@@ -211,7 +215,7 @@ class IncomingHandlers {
       let members = [];
       const entries = query.getChildren('item');
       for (let e in entries) {
-        if (!entries.hasOwnProperty(e)) {
+        if (!Object.hasOwnProperty.call(entries, e)) {
           continue;
         }
         members.push(entries[e].attrs.name);
@@ -262,7 +266,7 @@ class IncomingHandlers {
       if (query) {
         const entries = query.getChildren('item');
         for (let e in entries) {
-          if (! entries.hasOwnProperty(e)) {
+          if (! entries.hasOwn(e)) {
             continue;
           }
           this.session.debug('STANZA ATTRS: ', entries[e].attrs);
@@ -275,7 +279,7 @@ class IncomingHandlers {
               object: {
                 type: 'presence',
                 status: '',
-                presence: state
+                presence: getPresence(entries[e])
               }
             });
           } else if ((entries[e].attrs.subscription === 'from') &&

package/src/incoming-handlers.test.js

@@ -6,7 +6,6 @@ const parse = require('@xmpp/xml/lib/parse');
 const schemas = require('@sockethub/schemas').default;
 
 const stanzas = require('./incoming-handlers.data');
-const {os} = require("yarn/lib/cli");
 
 describe('Incoming handlers', () => {
   describe('XML stanzas result in the expected AS objects', () => {

package/src/index.js

@@ -98,7 +98,7 @@ class XMPP {
       requireCredentials: [ 'connect' ],
       initialized: false
     };
-  };
+  }
 
   /**
    * Connect to the XMPP server.
@@ -129,9 +129,8 @@ class XMPP {
     }
     this.debug('connect called for ' + job.actor.id);
     this.__client = client(utils.buildXmppCredentials(credentials));
-    this.__client.on("offline", (a) => {
+    this.__client.on("offline", () => {
       this.debug('offline');
-      // console.log("offline", a);
     });
 
     this.__client.start().then(() => {
@@ -145,7 +144,7 @@ class XMPP {
       delete this.__client;
       return done(err);
     });
-  };
+  }
 
   /**
    * Join a room, optionally defining a display name for that room.
@@ -180,7 +179,7 @@ class XMPP {
       from: job.actor.id,
       to: `${job.target.id}/${job.actor.name || id}`
     })).then(done);
-  };
+  }
 
   /**
    * Leave a room
@@ -215,7 +214,7 @@ class XMPP {
       to: `${job.target.id}/${job.actor.name}` || id,
       type: 'unavailable'
     })).then(done);
-  };
+  }
 
   /**
    * Send a message to a room or private conversation.
@@ -281,7 +280,7 @@ class XMPP {
       }) : undefined
     );
     this.__client.send(message).then(done);
-  };
+  }
 
   /**
    * @description
@@ -326,7 +325,7 @@ class XMPP {
     } else {
       done(`unknown update object type: ${job.object.type}`);
     }
-  };
+  }
 
   /**
    * @description
@@ -351,7 +350,7 @@ class XMPP {
   'request-friend'(job,  done) {
     this.debug('request-friend() called for ' + job.actor.id);
     this.__client.send(xml("presence", { type: "subscribe", to:job.target.id })).then(done);
-  };
+  }
 
   /**
    * @description
@@ -376,7 +375,7 @@ class XMPP {
   'remove-friend'(job, done) {
     this.debug('remove-friend() called for ' + job.actor.id);
     this.__client.send(xml("presence", { type: "unsubscribe", to:job.target.id })).then(done);
-  };
+  }
 
   /**
    * @description
@@ -401,7 +400,7 @@ class XMPP {
   'make-friend'(job, done) {
     this.debug('make-friend() called for ' + job.actor.id);
     this.__client.send(xml("presence", { type: "subscribe", to:job.target.id })).then(done);
-  };
+  }
 
   /**
    * Indicate an intent to query something (ie. get a list of users in a room).
@@ -459,7 +458,7 @@ class XMPP {
       from: job.actor.id,
       to: job.target.id
     }, xml("query", {xmlns: 'http://jabber.org/protocol/disco#items'}))).then(done);
-  };
+  }
 
   /**
    * Called when it's time to close any connections or clean data before being wiped
@@ -471,7 +470,7 @@ class XMPP {
     this.__forceDisconnect = true;
     this.__client.stop();
     done();
-  };
+  }
 
   __registerHandlers() {
     const ih = new IncomingHandlers(this);
@@ -479,7 +478,7 @@ class XMPP {
     this.__client.on('error', ih.error.bind(ih));
     this.__client.on('online', ih.online.bind(ih));
     this.__client.on('stanza', ih.stanza.bind(ih));
-  };
+  }
 }
 
 module.exports = XMPP;