@sockethub/platform-xmpp 5.0.0-alpha.10 → 5.0.0-alpha.11

package/dist/index.js

@@ -161,7 +161,7 @@ var require_escaping = __commonJS((exports, module) => {
     }
     return local.replaceAll(/^\s+|\s+$/g, "").replaceAll("\\", String.raw`\5c`).replaceAll(" ", String.raw`\20`).replaceAll('"', String.raw`\22`).replaceAll("&", String.raw`\26`).replaceAll("'", String.raw`\27`).replaceAll("/", String.raw`\2f`).replaceAll(":", String.raw`\3a`).replaceAll("<", String.raw`\3c`).replaceAll(">", String.raw`\3e`).replaceAll("@", String.raw`\40`);
   };
-  exports.unescape = function unescape(local) {
+  exports.unescape = function unescape2(local) {
     if (local === null) {
       return null;
     }
@@ -5107,9 +5107,9 @@ var require_caller = __commonJS((exports, module) => {
     }
   }
   module.exports = function iqCaller(...args) {
-    const iqCaller = new IQCaller(...args);
-    iqCaller.start();
-    return iqCaller;
+    const iqCaller2 = new IQCaller(...args);
+    iqCaller2.start();
+    return iqCaller2;
   };
 });
 
@@ -5161,7 +5161,7 @@ var require_callee = __commonJS((exports, module) => {
     return xml("error", { type }, xml(condition, NS_STANZA));
   }
   function iqHandler(entity) {
-    return async function iqHandler(ctx, next) {
+    return async function iqHandler2(ctx, next) {
       if (!isQuery(ctx))
         return next();
       const { stanza } = ctx;
@@ -7807,7 +7807,7 @@ var require_ponyfill_es2018 = __commonJS((exports, module) => {
       return isDOMExceptionConstructor(ctor) ? ctor : undefined;
     }
     function createPolyfill() {
-      const ctor = function DOMException(message, name) {
+      const ctor = function DOMException2(message, name) {
         this.message = message || "";
         this.name = name || "Error";
         if (Error.captureStackTrace) {
@@ -11540,7 +11540,7 @@ var require_resolve2 = __commonJS((exports, module) => {
     entity.Socket = Transport.prototype.Socket;
     entity.Parser = Transport.prototype.Parser;
   }
-  module.exports = function resolve({ entity }) {
+  module.exports = function resolve2({ entity }) {
     const _connect = entity.connect;
     entity.connect = async function connect(service) {
       if (!service || /:\/\//.test(service)) {
@@ -12410,7 +12410,7 @@ class IncomingHandlers {
       console.debug("close event received but session is undefined");
       return;
     }
-    this.session.debug("received close event with no handler specified");
+    this.session.log.debug("received close event with no handler specified");
     if (this.session.actor && this.session.sendToClient) {
       this.session.sendToClient({
         context: "xmpp",
@@ -12418,7 +12418,7 @@ class IncomingHandlers {
         actor: this.session.actor,
         target: this.session.actor
       });
-      this.session.debug(`**** xmpp this.session.for ${this.session.actor.id} closed`);
+      this.session.log.debug(`**** xmpp this.session.for ${this.session.actor.id} closed`);
     }
     if (this.session.connection && typeof this.session.connection.disconnect === "function") {
       this.session.connection.disconnect();
@@ -12436,7 +12436,7 @@ class IncomingHandlers {
         }
       });
     } catch (e2) {
-      this.session.debug("*** XMPP ERROR (rl catch): ", e2);
+      this.session.log.debug("*** XMPP ERROR (rl catch): ", e2);
     }
   }
   presence(stanza) {
@@ -12460,11 +12460,11 @@ class IncomingHandlers {
     } else {
       obj.actor.name = stanza.attrs.from.split("/")[1];
     }
-    this.session.debug(`received contact presence update from ${stanza.attrs.from}`);
+    this.session.log.debug(`received contact presence update from ${stanza.attrs.from}`);
     this.session.sendToClient(obj);
   }
   subscribe(to, from, name) {
-    this.session.debug(`received subscribe request from ${from}`);
+    this.session.log.debug(`received subscribe request from ${from}`);
     const actor = { id: from, type: "person" };
     if (name) {
       actor.name = name;
@@ -12576,7 +12576,7 @@ class IncomingHandlers {
     }
   }
   online() {
-    this.session.debug("online");
+    this.session.log.debug("online");
   }
   stanza(stanza) {
     if (stanza.attrs.type === "error") {
@@ -12587,7 +12587,7 @@ class IncomingHandlers {
       this.presence(stanza);
     } else if (stanza.is("iq")) {
       if (stanza.attrs.id === "muc_id" && stanza.attrs.type === "result") {
-        this.session.debug("got room attendance list");
+        this.session.log.debug("got room attendance list");
         return this.notifyRoomAttendance(stanza);
       }
       const query = stanza.getChild("query");
@@ -12597,7 +12597,7 @@ class IncomingHandlers {
           if (!entries.hasOwn(e2)) {
             continue;
           }
-          this.session.debug("STANZA ATTRS: ", entries[e2].attrs);
+          this.session.log.debug("STANZA ATTRS: ", entries[e2].attrs);
           if (entries[e2].attrs.subscription === "both") {
             this.session.sendToClient({
               context: "xmpp",
@@ -12634,7 +12634,7 @@ class IncomingHandlers {
         }
       }
     } else {
-      this.session.debug(`got XMPP unknown stanza... ${stanza}`);
+      this.session.log.debug(`got XMPP unknown stanza... ${stanza}`);
     }
   }
 }
@@ -12642,7 +12642,7 @@ class IncomingHandlers {
 var package_default = {
   name: "@sockethub/platform-xmpp",
   description: "A sockethub platform module implementing XMPP functionality",
-  version: "5.0.0-alpha.10",
+  version: "5.0.0-alpha.11",
   private: false,
   type: "module",
   author: "Nick Jennings <nick@silverbucket.net>",
@@ -12680,26 +12680,27 @@ var package_default = {
   scripts: {
     build: "bun build src/index.js --outdir dist --target node --format esm --sourcemap=external",
     clean: "rm -rf dist",
+    "clean:deps": "rm -rf node_modules",
     doc: "jsdoc2md --no-gfm --heading-depth 1 src/index.js > API.md"
   },
   dependencies: {
     "@xmpp/client": "^0.13.6"
   },
   devDependencies: {
-    "@sockethub/schemas": "^3.0.0-alpha.10",
+    "@sockethub/schemas": "^3.0.0-alpha.11",
     "@xmpp/xml": "^0.13.2",
     "jsdoc-to-markdown": "^8.0.3",
     sinon: "^17.0.2"
   },
   peerDependencies: {
-    "@sockethub/server": "^5.0.0-alpha.10"
+    "@sockethub/server": "^5.0.0-alpha.11"
   },
   peerDependenciesMeta: {
     "@sockethub/server": {
       optional: true
     }
   },
-  gitHead: "2dc0a34eab5c62afed5a336fc89a8b0318c8b5d4"
+  gitHead: "f7fb4fa2599da1def438c710ce81a41b6cfee8a7"
 };
 
 // src/schema.js
@@ -12787,10 +12788,10 @@ class XMPP {
     this.config = {
       connectTimeoutMs: 1e4,
       persist: true,
-      initialized: false,
       requireCredentials: ["connect"]
     };
-    this.debug = session.debug;
+    this.__initialized = false;
+    this.log = session.log;
     this.sendToClient = session.sendToClient;
     this.createClient();
     this.createXml();
@@ -12802,13 +12803,13 @@ class XMPP {
     this.__xml = $xml;
   }
   __markDisconnected(stopReconnection = false) {
-    this.debug(`marking client as disconnected for ${this.id}`);
+    this.log.debug(`marking client as disconnected for ${this.id}`);
     if (stopReconnection && this.__client) {
-      this.debug(`stopping automatic reconnection for ${this.id}`);
+      this.log.debug(`stopping automatic reconnection for ${this.id}`);
       this.__client.stop();
     }
     this.__client = undefined;
-    this.config.initialized = false;
+    this.__initialized = false;
   }
   __classifyError(err) {
     const errorString = err.toString();
@@ -12836,44 +12837,57 @@ class XMPP {
     try {
       return this.__client.socket && this.__client.socket.writable !== false && this.__client.status === "online";
     } catch (err) {
-      this.debug("Error checking client connection status:", err);
+      this.log.debug("Error checking client connection status:", err);
       return false;
     }
   }
   get schema() {
     return PlatformSchema;
   }
+  isInitialized() {
+    return this.__initialized;
+  }
   connect(job, credentials, done) {
     if (this.__isClientConnected()) {
-      this.debug(`client connection already exists for ${job.actor.id}`);
-      this.config.initialized = true;
+      this.log.debug(`client connection already exists for ${job.actor.id}`);
+      this.__initialized = true;
       return done();
     }
-    this.debug(`connect() called for ${job.actor.id}`);
+    this.log.debug(`connect() called for ${job.actor.id}`);
     const xmppCreds = utils.buildXmppCredentials(credentials);
-    this.debug(`building XMPP credentials for ${job.actor.id}:`, JSON.stringify({
+    this.log.debug(`building XMPP credentials for ${job.actor.id}:`, JSON.stringify({
       service: xmppCreds.service,
       username: xmppCreds.username,
       resource: xmppCreds.resource,
       timeout: this.config.connectTimeoutMs
     }));
-    this.debug(`creating XMPP client for ${job.actor.id}`);
+    this.log.debug(`creating XMPP client for ${job.actor.id}`);
     try {
       this.__client = this.__clientConstructor({
         ...xmppCreds,
         ...{ timeout: this.config.connectTimeoutMs, tls: false }
       });
-      this.debug(`XMPP client created successfully for ${job.actor.id}`);
+      this.log.debug(`XMPP client created successfully for ${job.actor.id}`);
     } catch (err) {
-      this.debug(`XMPP client creation failed for ${job.actor.id}:`, err);
+      this.log.debug(`XMPP client creation failed for ${job.actor.id}:`, err);
       return done(`client creation failed: ${err.message}`);
     }
     this.__client.on("offline", () => {
-      this.debug(`offline event received for ${job.actor.id}`);
-      this.__markDisconnected();
+      this.log.debug(`offline event received for ${job.actor.id}`);
+      if (!this.__initialized) {
+        this.log.debug(`offline during initial connection for ${job.actor.id}`);
+        this.__markDisconnected();
+      } else {
+        this.log.debug(`offline after successful connection for ${job.actor.id}, will auto-reconnect`);
+      }
     });
     this.__client.on("error", (err) => {
-      this.debug(`network error event for ${job.actor.id}:${err.toString()}`);
+      if (err instanceof TypeError || err instanceof ReferenceError || err instanceof SyntaxError) {
+        this.log.error(`FATAL: Internal code error in XMPP platform: ${err.toString()}`);
+        this.log.error(err.stack);
+        process.exit(1);
+      }
+      this.log.debug(`network error event for ${job.actor.id}:${err.toString()}`);
       const errorType = this.__classifyError(err);
       const as = {
         context: "xmpp",
@@ -12881,7 +12895,6 @@ class XMPP {
         actor: { id: job.actor.id }
       };
       if (errorType === "RECOVERABLE") {
-        this.__markDisconnected(false);
         as.error = `Connection lost: ${err.toString()}. Attempting automatic reconnection...`;
         as.object = {
           type: "connect",
@@ -12900,19 +12913,19 @@ class XMPP {
       this.sendToClient(as);
     });
     this.__client.on("online", () => {
-      this.debug(`online event received for ${job.actor.id}`);
+      this.log.debug(`online event received for ${job.actor.id}`);
     });
-    this.debug(`starting XMPP client connection for ${job.actor.id}`);
+    this.log.debug(`starting XMPP client connection for ${job.actor.id}`);
     const startTime = Date.now();
     this.__client.start().then(() => {
       const duration = Date.now() - startTime;
-      this.debug(`connection successful for ${job.actor.id} after ${duration}ms`);
-      this.config.initialized = true;
+      this.log.debug(`connection successful for ${job.actor.id} after ${duration}ms`);
+      this.__initialized = true;
       this.__registerHandlers();
       return done();
     }).catch((err) => {
       const duration = Date.now() - startTime;
-      this.debug(`connection failed for ${job.actor.id} after ${duration}ms:`, {
+      this.log.debug(`connection failed for ${job.actor.id} after ${duration}ms:`, {
         error: err,
         message: err?.message,
         code: err?.code,
@@ -12923,7 +12936,7 @@ class XMPP {
     });
   }
   async join(job, done) {
-    this.debug(`sending join from ${job.actor.id} to ` + `${job.target.id}/${job.actor.name}`);
+    this.log.debug(`sending join from ${job.actor.id} to ` + `${job.target.id}/${job.actor.name}`);
     const id = job.target.id.split("/")[0];
     const presence = this.__xml("presence", {
       from: job.actor.id,
@@ -12932,7 +12945,7 @@ class XMPP {
     return this.__client.send(presence).then(done).catch(done);
   }
   leave(job, done) {
-    this.debug(`sending leave from ${job.actor.id} to ` + `${job.target.id}/${job.actor.name}`);
+    this.log.debug(`sending leave from ${job.actor.id} to ` + `${job.target.id}/${job.actor.name}`);
     const id = job.target.id.split("/")[0];
     this.__client.send(this.__xml("presence", {
       from: job.actor.id,
@@ -12941,7 +12954,7 @@ class XMPP {
     })).then(done);
   }
   send(job, done) {
-    this.debug(`send() called for ${job.actor.id}`);
+    this.log.debug(`send() called for ${job.actor.id}`);
     const message = this.__xml("message", {
       type: job.target.type === "room" ? "groupchat" : "chat",
       to: job.target.id,
@@ -12953,7 +12966,7 @@ class XMPP {
     this.__client.send(message).then(done);
   }
   update(job, done) {
-    this.debug(`update() called for ${job.actor.id}`);
+    this.log.debug(`update() called for ${job.actor.id}`);
     const props = {};
     const show = {};
     const status = {};
@@ -12966,35 +12979,35 @@ class XMPP {
       if (job.object.content) {
         status.status = job.object.content;
       }
-      this.debug(`setting presence: ${job.object.presence}`);
+      this.log.debug(`setting presence: ${job.object.presence}`);
       this.__client.send(this.__xml("presence", props, show, status)).then(done);
     } else {
       done(`unknown update object type: ${job.object.type}`);
     }
   }
   "request-friend"(job, done) {
-    this.debug(`request-friend() called for ${job.actor.id}`);
+    this.log.debug(`request-friend() called for ${job.actor.id}`);
     this.__client.send(this.__xml("presence", {
       type: "subscribe",
       to: job.target.id
     })).then(done);
   }
   "remove-friend"(job, done) {
-    this.debug(`remove-friend() called for ${job.actor.id}`);
+    this.log.debug(`remove-friend() called for ${job.actor.id}`);
     this.__client.send(this.__xml("presence", {
       type: "unsubscribe",
       to: job.target.id
     })).then(done);
   }
   "make-friend"(job, done) {
-    this.debug(`make-friend() called for ${job.actor.id}`);
+    this.log.debug(`make-friend() called for ${job.actor.id}`);
     this.__client.send(this.__xml("presence", {
       type: "subscribe",
       to: job.target.id
     })).then(done);
   }
   query(job, done) {
-    this.debug(`sending query from ${job.actor.id} for ${job.target.id}`);
+    this.log.debug(`sending query from ${job.actor.id} for ${job.target.id}`);
     this.__client.send(this.__xml("iq", {
       id: "muc_id",
       type: "get",
@@ -13005,12 +13018,12 @@ class XMPP {
     }))).then(done);
   }
   disconnect(job, done) {
-    this.debug("disconnecting");
+    this.log.debug("disconnecting");
     this.cleanup(done);
   }
   cleanup(done) {
-    this.debug("cleanup");
-    this.config.initialized = false;
+    this.log.debug("cleanup");
+    this.__initialized = false;
     this.__client.stop();
     done();
   }
@@ -13026,4 +13039,4 @@ export {
   XMPP as default
 };
 
-//# debugId=4DA52DDAE3F63AEC64756E2164756E21
+//# debugId=C3F55E34F6FAE0AE64756E2164756E21