Merge branch 'main' into websocket

packages/client/README.md

@@ -293,10 +293,3 @@ PLAIN should only be used over secure WebSocket (`wss://)`, direct TLS (`xmpps:`
 - ☐ : Optional
 - ✗ : Unavailable
 - ✔ : Included
-
-## Common issues
-
-<details>
-  <summary><strong>Unable to resolve module</strong></summary>
-  <p>If you are using an older React Native version, please require/import <code>@xmpp/client/reat-native</code> instead of <code>@xmpp/client</code>.</p>
-</details>

packages/websocket/lib/Connection.js

@@ -13,16 +13,16 @@ const NS_FRAMING = "urn:ietf:params:xml:ns:xmpp-framing";
 
 class ConnectionWebSocket extends Connection {
   send(element, ...args) {
-    if (!element.attrs.xmlns && super.isStanza(element)) {
-      element.attrs.xmlns = "jabber:client";
-    }
-
+    element.attrs.xmlns ??= this.NS;
     return super.send(element, ...args);
   }
 
   async sendMany(elements) {
     for (const element of elements) {
-      await this.send(element);
+      element.attrs.xmlns ??= this.NS;
+      element.parent = this.root;
+      this.socket.write(element.toString());
+      this.emit("send", element);
     }
   }
 

packages/websocket/lib/Socket.js

@@ -64,9 +64,9 @@ export default class Socket extends EventEmitter {
     try {
       this.socket.send(data);
     } catch (err) {
-      fn(err);
+      fn?.(err);
       return;
     }
-    fn();
+    fn?.();
   }
 }

packages/websocket/test/test.js

@@ -3,15 +3,18 @@ import Socket from "../lib/Socket.js";
 import { EventEmitter } from "@xmpp/events";
 import xml from "@xmpp/xml";
 
-test("send() adds jabber:client xmlns", () => {
+test("send()", () => {
   const connection = new ConnectionWebSocket();
   connection.write = () => {};
+  connection.root = xml("root");
 
   const element = xml("presence");
 
   expect(element.attrs.xmlns).toBe(undefined);
+  expect(element.parent).toBe(null);
   connection.send(element);
   expect(element.attrs.xmlns).toBe("jabber:client");
+  expect(element.parent).toBe(connection.root);
 });
 
 test("socketParameters()", () => {
@@ -27,7 +30,7 @@ test("socketParameters()", () => {
   expect(params).toBe(undefined);
 });
 
-test("DOM WebSocket error", () => {
+test("WebSocket error", () => {
   const socket = new Socket();
   const sock = new EventEmitter();
   sock.addEventListener = sock.addListener;
@@ -44,22 +47,6 @@ test("DOM WebSocket error", () => {
   socket.socket.emit("error", evt);
 });
 
-test("WS WebSocket error", () => {
-  const socket = new Socket();
-  const sock = new EventEmitter();
-  sock.addEventListener = sock.addListener;
-  socket._attachSocket(sock);
-  socket.url = "ws://foobar";
-  const error = {};
-  const evt = { error };
-  socket.on("error", (err) => {
-    expect(err).toBe(error);
-    expect(err.event).toBe(evt);
-    expect(err.url).toBe("ws://foobar");
-  });
-  socket.socket.emit("error", evt);
-});
-
 test("socket close", () => {
   expect.assertions(3);
   const socket = new Socket();
@@ -81,15 +68,27 @@ test("socket close", () => {
 
 test("sendMany", async () => {
   const conn = new ConnectionWebSocket();
+  conn.socket = new Socket();
+  const spy_write = jest.spyOn(conn.socket, "write");
+  conn.root = xml("root");
+
+  const foo = xml("presence");
+  const bar = xml("presence");
+  const elements = [foo, bar];
 
-  const foo = xml("foo");
-  const bar = xml("bar");
+  for (const element of elements) {
+    expect(element.attrs.xmlns).toBe(undefined);
+    expect(element.parent).toBe(null);
+  }
 
-  const spy_send = (conn.send = jest.fn());
+  conn.sendMany(elements);
 
-  await conn.sendMany([foo, bar]);
+  for (const element of elements) {
+    expect(element.attrs.xmlns).toBe("jabber:client");
+    expect(element.parent).toBe(conn.root);
+  }
 
-  expect(spy_send).toHaveBeenCalledWith(foo);
-  expect(spy_send).toHaveBeenCalledWith(bar);
-  expect(spy_send).toHaveBeenCalledTimes(2);
+  expect(spy_write).toHaveBeenCalledWith(foo.toString());
+  expect(spy_write).toHaveBeenCalledWith(bar.toString());
+  expect(spy_write).toHaveBeenCalledTimes(2);
 });