@sockethub/platform-xmpp 5.0.0-beta.1 → 5.0.0-beta.2

package/README.md

@@ -34,7 +34,7 @@ This requirement also applies to automatic reconnections.
 ### Credentials object
 
 | Field | Type | Required | Description |
-|---|---|---|---|
+| --- | --- | --- | --- |
 | `type` | string | yes | Must be `"credentials"`. |
 | `userAddress` | string | yes | Bare JID, e.g. `user@jabber.net`. |
 | `resource` | string | yes | XMPP resource identifier (e.g. `"phone"`). |
@@ -317,6 +317,31 @@ non-recoverable connection error.
 }
 ```
 
+## Incoming presence and roster
+
+Live presence arrives as an `update` with `object.type` `presence`. `actor.id`
+is the sender's full JID, with `actor.type` `room` for a joined room and
+`person` otherwise; when the stanza has no `to`, `actor.name` is the resource
+part. `object.presence` is the `<show>` value, `offline` for an `unavailable`
+stanza, and `online` otherwise. A `<status>` element is copied to
+`object.content`. The responses schema accepts only `away`, `chat`, `dnd`,
+`xa`, `offline`, `online`, and `notauthorized`; a stanza with any other
+`<show>` value is dropped and the server logs
+`dropping malformed outbound message`.
+
+Roster data (`jabber:iq:roster`) is trusted only from the server (a stanza
+with no `from`) or from this account's own bare JID, per
+[RFC 6121 section 2.1.6](https://www.rfc-editor.org/rfc/rfc6121#section-2.1.6).
+Any other sender, including this account's full JID, is ignored and produces
+no client event. Roster items with subscription `none`, `to`, or `from`
+without a pending request are delivered as `request-friend`, with the contact
+JID and roster name in `actor`. Items with a mutual (`both`) subscription are
+delivered as a presence `update` with `object.presence` `online`; items where
+this account's own subscription request is still pending (`from` with
+`ask="subscribe"`) are delivered as a presence `update` with
+`object.presence` `notauthorized`. Every roster
+activity carries this account's bare JID in `target.id`.
+
 ## Features
 
 * **Instant messaging**: Send and receive one-on-one messages

package/dist/index.js

@@ -51687,7 +51687,7 @@ var ActivityStreamSchema = {
 var package_default = {
   name: "@sockethub/schemas",
   description: "JSON schema files for validating Sockethub Activity Streams",
-  version: "3.0.0-beta.1",
+  version: "3.0.0-beta.2",
   type: "module",
   private: false,
   author: "Nick Jennings <nick@silverbucket.net>",
@@ -51757,7 +51757,7 @@ var package_default = {
     "ajv-formats": "^2.1.1",
     "ajv-formats-draft2019": "^1.6.1"
   },
-  gitHead: "06c9062f1cb5f0c0599fd979e6e91da79f08eda0",
+  gitHead: "1f74d4e07311496f0acc021855137bc197d79eab",
   types: "./dist/index.d.ts"
 };
 
@@ -51862,8 +51862,11 @@ var SockethubConfigSchema = {
         "@sockethub/platform-caldav",
         "@sockethub/platform-dummy",
         "@sockethub/platform-feeds",
+        "@sockethub/platform-email",
         "@sockethub/platform-irc",
         "@sockethub/platform-metadata",
+        "@sockethub/platform-messenger",
+        "@sockethub/platform-instagram",
         "@sockethub/platform-xmpp"
       ]
     },
@@ -51879,7 +51882,8 @@ var SockethubConfigSchema = {
             connectTimeoutMs: { type: "integer", minimum: 1 },
             allowPrivateAddresses: { type: "boolean" },
             allowInsecureHttp: { type: "boolean" },
-            concurrency: { type: "integer", minimum: 1 }
+            concurrency: { type: "integer", minimum: 1 },
+            discoveryCacheTtlMs: { type: "integer", minimum: 0 }
           }
         },
         "@sockethub/platform-caldav": {
@@ -51889,7 +51893,20 @@ var SockethubConfigSchema = {
             connectTimeoutMs: { type: "integer", minimum: 1 },
             allowPrivateAddresses: { type: "boolean" },
             allowInsecureHttp: { type: "boolean" },
-            concurrency: { type: "integer", minimum: 1 }
+            concurrency: { type: "integer", minimum: 1 },
+            discoveryCacheTtlMs: { type: "integer", minimum: 0 }
+          }
+        },
+        "@sockethub/platform-email": {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            connectTimeoutMs: {
+              type: "integer",
+              minimum: 5000,
+              maximum: 120000
+            },
+            allowPrivateAddresses: { type: "boolean" }
           }
         },
         "@sockethub/platform-dummy": {
@@ -51912,7 +51929,8 @@ var SockethubConfigSchema = {
           type: "object",
           additionalProperties: false,
           properties: {
-            connectTimeoutMs: { type: "number" }
+            connectTimeoutMs: { type: "number" },
+            allowPrivateAddresses: { type: "boolean" }
           }
         },
         "@sockethub/platform-xmpp": {
@@ -52022,6 +52040,12 @@ var SockethubConfigSchema = {
           default: 20,
           description: "Maximum persistent instances per client IP, including HTTP actions. 0 disables the cap."
         },
+        maxStartsPerIpPerMinute: {
+          type: "integer",
+          minimum: 0,
+          default: 60,
+          description: "Maximum new persistent instances a client IP may start per minute, " + "including HTTP actions. Bounds fork/teardown churn that the " + "concurrent caps allow. Reusing a running instance does not count. " + "0 disables the cap."
+        },
         maxPlatformInstances: {
           type: "number",
           minimum: 0,
@@ -52592,7 +52616,7 @@ function createGuardedLookup(allowPrivateAddresses) {
       if (!allowPrivateAddresses) {
         for (const { address } of addresses) {
           if (isBlockedAddress(address)) {
-            callback(new Error(`blocked non-public address ${address} for ${hostname}`));
+            callback(new Error(`blocked non-public address for ${hostname}`));
             return;
           }
         }
@@ -52644,7 +52668,7 @@ function guardXmppConnections(client, allowPrivateAddresses) {
 var package_default2 = {
   name: "@sockethub/platform-xmpp",
   description: "A sockethub platform module implementing XMPP functionality",
-  version: "5.0.0-beta.1",
+  version: "5.0.0-beta.2",
   private: false,
   type: "module",
   author: "Nick Jennings <nick@silverbucket.net>",
@@ -52688,12 +52712,12 @@ var package_default2 = {
     doc: "typedoc --options typedoc.json"
   },
   dependencies: {
-    "@sockethub/util": "^1.0.0-beta.1",
+    "@sockethub/util": "^1.0.0-beta.2",
     "@xmpp/client": "^0.13.6",
     "@xmpp/resolve": "^0.13.3"
   },
   devDependencies: {
-    "@sockethub/schemas": "^3.0.0-beta.1",
+    "@sockethub/schemas": "^3.0.0-beta.2",
     "@types/bun": "latest",
     "@xmpp/xml": "^0.13.2",
     ajv: "^8.17.1",
@@ -52701,14 +52725,14 @@ var package_default2 = {
     typedoc: "^0.28.14"
   },
   peerDependencies: {
-    "@sockethub/server": "^5.0.0-beta.1"
+    "@sockethub/server": "^5.0.0-beta.2"
   },
   peerDependenciesMeta: {
     "@sockethub/server": {
       optional: true
     }
   },
-  gitHead: "06c9062f1cb5f0c0599fd979e6e91da79f08eda0",
+  gitHead: "1f74d4e07311496f0acc021855137bc197d79eab",
   types: "./dist/index.d.ts"
 };
 
@@ -53443,6 +53467,10 @@ class IncomingHandlers {
       this.notifyError(stanza);
     } else if (stanza.is("message")) {
       this.notifyChatMessage(stanza);
+    } else if (stanza.is("presence") && stanza.attrs.type === "subscribe") {
+      this.subscribe({ id: this.session?.__bareJid ?? "", type: "person" }, (stanza.attrs.from ?? "").split("/")[0]);
+    } else if (stanza.is("presence") && ["subscribed", "unsubscribe", "unsubscribed"].includes(stanza.attrs.type ?? "")) {
+      this.session?.log.debug(`ignoring ${stanza.attrs.type} presence from ${stanza.attrs.from}`);
     } else if (stanza.is("presence")) {
       this.presence(stanza);
     } else if (stanza.is("iq")) {
@@ -53460,6 +53488,10 @@ class IncomingHandlers {
       const from = stanza.attrs.from;
       if (query && (!from || from === this.session?.__bareJid)) {
         const entries = query.getChildren("item");
+        const self2 = {
+          id: this.session?.__bareJid ?? "",
+          type: "person"
+        };
         for (const e in entries) {
           if (!Object.hasOwn(entries, e)) {
             continue;
@@ -53474,13 +53506,9 @@ class IncomingHandlers {
                 name: entries[e].attrs.name,
                 type: "person"
               },
-              target: this.session?.actor ?? {
-                id: "",
-                type: "person"
-              },
+              target: self2,
               object: {
                 type: "presence",
-                status: "",
                 presence: getPresence(entries[e])
               }
             });
@@ -53493,18 +53521,14 @@ class IncomingHandlers {
                 name: entries[e].attrs.name,
                 type: "person"
               },
-              target: this.session?.actor ?? {
-                id: "",
-                type: "person"
-              },
+              target: self2,
               object: {
                 type: "presence",
-                statusText: "",
                 presence: "notauthorized"
               }
             });
           } else {
-            this.subscribe(this.session?.actor ?? { id: "", type: "person" }, entries[e].attrs.jid ?? "", entries[e].attrs.name);
+            this.subscribe(self2, entries[e].attrs.jid ?? "", entries[e].attrs.name);
           }
         }
       }
@@ -53851,7 +53875,7 @@ class XMPP {
     }
     this.log.debug(`make-friend() called for ${job.actor.id}`);
     this.__client.send(this.__xml("presence", {
-      type: "subscribe",
+      type: "subscribed",
       to: job.target?.id
     })).then(() => done()).catch(done);
   }
@@ -53914,4 +53938,4 @@ export {
   setTlsServername
 };
 
-//# debugId=FF593C0320CAF98664756E2164756E21
+//# debugId=5D52A025A2E831CE64756E2164756E21