Merge branch 'master' of github.com:legastero/stanza

Author: legastero

docs/Supported_XEP_Formats.md

@@ -102,4 +102,5 @@
 | [XEP-0371](https://xmpp.org/extensions/xep-0371.html) | Jingle ICE Transport Method                        | 0.2     | [Source](../src/protocol/xep0176.ts) | [Test Cases](../test/protocol-cases/xep0371) |
 | [XEP-0380](https://xmpp.org/extensions/xep-0380.html) | Explicit Message Encryption                        | 0.2.0   | [Source](../src/protocol/xep0380.ts) | [Test Cases](../test/protocol-cases/xep0380) |
 | [XEP-0384](https://xmpp.org/extensions/xep-0384.html) | OMEMO Encryption                                   | 0.3.0   | [Source](../src/protocol/xep0384.ts) | [Test Cases](../test/protocol-cases/xep0384) |
+| [XEP-0421](https://xmpp.org/extensions/xep-0421.html) | Occupant identifiers for semi-anonymous MUCs       | 1.0.1   | [Source](../src/protocol/xep0421.ts) | [Test Cases](../test/protocol-cases/xep0421) |
 | [XEP-0432](https://xmpp.org/extensions/xep-0432.html) | Simple JSON Messaging                              | 0.1.0   | [Source](../src/protocol/xep0335.ts) | [Test Cases](../test/protocol-cases/xep0432) |

src/Namespaces.ts

@@ -378,6 +378,9 @@ export const NS_OMEMO_AXOLOTL_BUNDLES = 'eu.siacs.conversations.axolotl.bundles'
 export const NS_OMEMO_AXOLOTL_BUNDLE = (deviceId: string): string =>
     `${NS_OMEMO_AXOLOTL_BUNDLES}:${deviceId}`;
 
+// XEP-0421
+export const NS_OCCUPANT_0 = 'urn:xmpp:occupant-id:0';
+
 // XEP-0432
 export const NS_JSON_MESSAGE_0 = 'urn:xmpp:json-msg:0';
 

src/protocol/index.ts

@@ -98,6 +98,7 @@ export * from './xep0359';
 export * from './xep0363';
 export * from './xep0380';
 export * from './xep0384';
+export * from './xep0421';
 export * from './xrd';
 
 import RFC3921 from './rfc3921';
@@ -180,6 +181,7 @@ import XEP0359 from './xep0359';
 import XEP0363 from './xep0363';
 import XEP0380 from './xep0380';
 import XEP0384 from './xep0384';
+import XEP0421 from './xep0421';
 import XRD from './xrd';
 
 const Protocol: Array<DefinitionOptions | DefinitionOptions[]> = [
@@ -263,6 +265,7 @@ const Protocol: Array<DefinitionOptions | DefinitionOptions[]> = [
     XEP0363,
     XEP0380,
     XEP0384,
+    XEP0421,
     XRD
 ];
 

src/protocol/xep0421.ts

@@ -0,0 +1,34 @@
+// ====================================================================
+// XEP-0421: Occupant identifiers for semi-anonymous MUCs
+// --------------------------------------------------------------------
+// Source: https://xmpp.org/extensions/xep-0421.html
+// Version: 1.0.1 (2025-04-09)
+// ====================================================================
+
+import {
+    childAttribute,
+    DefinitionOptions,
+    extendMessage,
+    extendPresence
+} from '../jxt';
+
+import { NS_OCCUPANT_0 } from '../Namespaces';
+
+declare module './' {
+    export interface Presence {
+        occupantId?: string;
+    }
+    export interface Message {
+        occupantId?: string;
+    }
+}
+
+const Protocol: DefinitionOptions[] = [
+    extendPresence({
+        occupantId: childAttribute(NS_OCCUPANT_0, 'occupant-id', 'id')
+    }),
+    extendMessage({
+        occupantId: childAttribute(NS_OCCUPANT_0, 'occupant-id', 'id')
+    })
+];
+export default Protocol;

test/protocol-cases/xep0421/message-occupant.json

@@ -0,0 +1,8 @@
+[
+    "message",
+    {
+        "from": "juliet@capulet.com/balcony",
+        "lang": "",
+        "occupantId": "dd72603deec90a38ba552f7c68cbcc61bca202cd"
+    }
+]

test/protocol-cases/xep0421/message-occupant.xml

@@ -0,0 +1,3 @@
+<message from='juliet@capulet.com/balcony'>
+  <occupant-id xmlns='urn:xmpp:occupant-id:0' id='dd72603deec90a38ba552f7c68cbcc61bca202cd' />
+</message>

test/protocol-cases/xep0421/presence-occupant.json

@@ -0,0 +1,9 @@
+[
+    "presence",
+    {
+        "from": "juliet@capulet.com/balcony",
+        "lang": "",
+        "priority": 0,
+        "occupantId": "dd72603deec90a38ba552f7c68cbcc61bca202cd"
+    }
+]

test/protocol-cases/xep0421/presence-occupant.xml

@@ -0,0 +1,3 @@
+<presence from='juliet@capulet.com/balcony'>
+  <occupant-id xmlns='urn:xmpp:occupant-id:0' id='dd72603deec90a38ba552f7c68cbcc61bca202cd' />
+</presence>